X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=pm_filter;h=5ee5a1b9890d8b2b60ae67686aa1f841a7531d01;hp=89449bd914122b88f85145a7fd7223ac5635f021;hb=3a23cdde7d5621bc8d723d2226945ee5243115f3;hpb=f4d99ac1ca03121255e545df89e7d841a02cc0bf

diff --git a/pm_filter b/pm_filter
index 89449bd91..5ee5a1b98 100755
--- a/pm_filter
+++ b/pm_filter
@@ -3,6 +3,7 @@
 BEGIN {
 	$prefix=shift;
 	$ver=shift;
+	$libdir=shift;
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
@@ -12,5 +13,21 @@ elsif (/VERSION_AUTOREPLACE/) {
 	$_=qq{our \$version="$ver";};
 }
 elsif (/^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.
+	# 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{^(#!.*perl.*?) -T$}) {
+	$_=qq{$1\n};
+}
+elsif (/^\$ENV{PATH}="(.*)";/) {
+	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
 }