(no commit message)

[git.ikiwiki.info.git] / pm_filter

diff --git a/pm_filter b/pm_filter
index 4984f32d906eae416001dad7f29baab986c0d8c2..351e0b4d99a0104434d687c71fd474f14f6adb08 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -7,12 +7,12 @@ BEGIN {
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
-       $_=qq{our \$installdir="$prefix";};
+       $_=qq{our \$installdir='$prefix';};
 }
 elsif (/VERSION_AUTOREPLACE/) {
        $_=qq{our \$version="$ver";};
 }
-elsif (/^use lib/) {
+elsif (/^(?:use FindBin; *)?use lib/) {
        # The idea here is to figure out if the libdir the Makefile.PL
        # was configured to use is in perl's normal search path.
        # If not, hard code it into ikiwiki.
@@ -25,9 +25,9 @@ elsif (/^use lib/) {
                $_="use lib '$libdir';\n";
        }
 }
-elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) {
-       $_=qq{$1\n};
+elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) {
+       $_=qq{$1 -T\n};
 }
-elsif (/^\$ENV{PATH}="(.*)";/) {
+elsif (/^\$ENV\{PATH}="(.*)";/) {
        $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
 }