From f05e12876f64dfc31c84a71d37522ca435438c38 Mon Sep 17 00:00:00 2001 From: kramm Date: Mon, 17 Mar 2008 10:58:42 +0000 Subject: [PATCH] build .orig files *before* patching --- lib/pdf/inject-xpdf.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/pdf/inject-xpdf.pl b/lib/pdf/inject-xpdf.pl index b917023..0e08c53 100755 --- a/lib/pdf/inject-xpdf.pl +++ b/lib/pdf/inject-xpdf.pl @@ -15,7 +15,12 @@ system("tar -zxvf ../../$filename") and die; system("find -type f -exec mv {} .. \\;") and die; chdir(".."); system("find -type d -exec rmdir {} \\; 2> /dev/null"); -system("patch < ../xpdf-changes.patch"); + +$c = 'find . \( -name "*.cc" -or -name "*.h" -or -name "*.c" \) -exec cp {} {}.orig \;'; +print "$c\n"; +system($c); + +system("patch < ../xpdf-changes.patch 2>&1 | grep failed"); chdir(".."); system("rm -f xpdf"); system("ln -s $directory xpdf"); @@ -45,7 +50,4 @@ EOF close(fi); system("chmod a+x switch"); -$c = 'find '.$directory.' \( -name "*.cc" -or -name "*.h" -or -name "*.c" \) -exec cp {} {}.orig \;'; -print "$c\n"; -system($c); -- 1.7.10.4