blogspam uses JSON instead of RPC::XML now.

[git.ikiwiki.info.git] / pm_filter

diff --git a/pm_filter b/pm_filter
index 5ee5a1b9890d8b2b60ae67686aa1f841a7531d01..1e51f9dd347c79e738d4aa9b4ef33da86aeafbfa 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -7,14 +7,14 @@ BEGIN {
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
-       $_=qq{my \$installdir="$prefix";};
+       $_=qq{our \$installdir="$prefix";};
 }
 elsif (/VERSION_AUTOREPLACE/) {
        $_=qq{our \$version="$ver";};
 }
 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,8 +25,8 @@ 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}="(.*)";/) {
        $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";