X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f02ee863454693dce8fcb209c28c1d2efa0ff77..9205e0ff82b511a2759530c1e2597eaafd3cf488:/pm_filter

diff --git a/pm_filter b/pm_filter
index a66cf2154..5ee5a1b98 100755
--- a/pm_filter
+++ b/pm_filter
@@ -13,16 +13,21 @@ 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 configure 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} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
+elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) {
 	$_=qq{$1\n};
 }
-if (/^\$ENV{PATH}="(.*)";/) {
+elsif (/^\$ENV{PATH}="(.*)";/) {
 	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
 }