X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7e6abdfd1c4d72df154f8e3ac64cdec9317c1c39..dc126c54264612607633f95ee7104c4c3653a6ca:/pm_filter diff --git a/pm_filter b/pm_filter index 71f26fae8..8e1480564 100755 --- a/pm_filter +++ b/pm_filter @@ -14,7 +14,7 @@ elsif (/VERSION_AUTOREPLACE/) { } elsif (/^use lib/) { # The idea here is to figure out if the libdir the Makefile.PL - # was configure to use is in perl's normal search path. + # was configured to use is in perl's normal search path. # If not, hard code it into ikiwiki. if ((grep { $_ eq $libdir } @INC) && (! exists $ENV{PERL5LIB} || ! length $ENV{PERL5LIB} || @@ -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"; }