X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5bc73d7facbea81ae533777affaffbe3d7476c0f..37bf6114d5aa19180001aedd78fef84e2fd6c103:/pm_filter?ds=sidebyside diff --git a/pm_filter b/pm_filter index f61e7810b..1e51f9dd3 100755 --- a/pm_filter +++ b/pm_filter @@ -7,16 +7,27 @@ BEGIN { } if (/INSTALLDIR_AUTOREPLACE/) { - $_=qq{my \$installdir="$prefix";}; + $_=qq{our \$installdir="$prefix";}; } elsif (/VERSION_AUTOREPLACE/) { $_=qq{our \$version="$ver";}; } elsif (/^use lib/) { - if (grep { $_ eq $libdir } @INC) { + # 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. + if ((grep { $_ eq $libdir } @INC) && + (! exists $ENV{PERL5LIB} || ! length $ENV{PERL5LIB} || + $ENV{PERL5LIB} ne $libdir)) { $_=""; } else { $_="use lib '$libdir';\n"; } } +elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) { + $_=qq{$1 -T\n}; +} +elsif (/^\$ENV{PATH}="(.*)";/) { + $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n"; +}