X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7e6abdfd1c4d72df154f8e3ac64cdec9317c1c39..9a23789b6b900e8bf06c8138434cfd3316f82f98:/pm_filter?ds=sidebyside

diff --git a/pm_filter b/pm_filter
index 71f26fae8..374e9a44f 100755
--- a/pm_filter
+++ b/pm_filter
@@ -12,9 +12,9 @@ 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 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";
 }