X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Finject-xpdf.pl;h=16b2a77fb511430b43e77f97f719e93256f37dc5;hb=d46619a310dd04066cc117e904b84785d1a0cd51;hp=8693f813fbbd2a708d079ee2b88f6fdcf402396d;hpb=f761e3549edc5d3fe128f2e757d64e4c2469f613;p=swftools.git

diff --git a/lib/pdf/inject-xpdf.pl b/lib/pdf/inject-xpdf.pl
index 8693f81..16b2a77 100755
--- a/lib/pdf/inject-xpdf.pl
+++ b/lib/pdf/inject-xpdf.pl
@@ -12,10 +12,15 @@ mkdir("$directory/tmp/");
 
 chdir("$directory/tmp/") or die;
 system("tar -zxvf ../../$filename") and die;
-system("find -type f -exec mv {} .. \\;") and die;
+system("find . -type f -exec mv {} .. \\;") and die;
 chdir("..");
-system("find -type d -exec rmdir {} \\; 2> /dev/null");
-system("patch --verbose < ../xpdf-changes.patch") and die;
+system("find . -type d -exec rmdir {} \\; 2> /dev/null");
+
+$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 -i failed");
 chdir("..");
 system("rm -f xpdf");
 system("ln -s $directory xpdf");
@@ -29,9 +34,8 @@ VERSION=\$1
 PS3="choose> "
 
 if test "x\$VERSION" = "x";then
-    select V in stable latest;do VERSION="$V";break;done
+    select V in stable latest;do VERSION="\$V";break;done
 fi
-
 if test "x\$VERSION" = "xstable";then
     echo "Switching to stable version"
     rm -f xpdf
@@ -46,3 +50,4 @@ EOF
 close(fi);
 system("chmod a+x switch");
 
+