X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Finject-xpdf.pl;h=16b2a77fb511430b43e77f97f719e93256f37dc5;hb=322a2f4bf5cdb00be99a0fe660372b1596265a4d;hp=045e99097934ab786c61af6dd59496a62246b621;hpb=8a8b565fc2afe928ac84943079b3500ff5667ba9;p=swftools.git

diff --git a/lib/pdf/inject-xpdf.pl b/lib/pdf/inject-xpdf.pl
index 045e990..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");
@@ -25,13 +30,12 @@ open(fi, ">switch");
 print fi <<EOF
 #!/bin/sh
 
-VERSION=$1
+VERSION=\$1
 PS3="choose> "
 
-if test "x$VERSION" = "x";then
-    select V in stable latest;do VERSION="$V";break;done
+if test "x\$VERSION" = "x";then
+    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");
 
+