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

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