X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=pm_filter;h=4984f32d906eae416001dad7f29baab986c0d8c2;hb=f4a1732b0e65ea4459098e4e852dff10a5af9320;hp=98cb5bd9ef930f5bb55d4efd4b27ea015fa987ae;hpb=8fdb37d7bc1a36a1a558f5c0e34df38f1d4e5507;p=ikiwiki.git

diff --git a/pm_filter b/pm_filter
index 98cb5bd9e..4984f32d9 100755
--- a/pm_filter
+++ b/pm_filter
@@ -7,13 +7,18 @@ 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 {