X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/729991564ec7e1116fc023c51e73b47af8b6fce7..f5a1550441a9d58652d93deacc333f143a7ecfbd:/pm_filter diff --git a/pm_filter b/pm_filter index 1e51f9dd3..374e9a44f 100755 --- a/pm_filter +++ b/pm_filter @@ -12,7 +12,7 @@ if (/INSTALLDIR_AUTOREPLACE/) { 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. @@ -28,6 +28,6 @@ elsif (/^use lib/) { elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) { $_=qq{$1 -T\n}; } -elsif (/^\$ENV{PATH}="(.*)";/) { +elsif (/^\$ENV\{PATH}="(.*)";/) { $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n"; }