Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / pm_filter

diff --git a/pm_filter b/pm_filter
index 89449bd914122b88f85145a7fd7223ac5635f021..8e1480564af9400e050c32ed634d6cc1beb64a97 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -3,14 +3,31 @@
 BEGIN {
        $prefix=shift;
        $ver=shift;
 BEGIN {
        $prefix=shift;
        $ver=shift;

+       $libdir=shift;

 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {
 }
 
 if (/INSTALLDIR_AUTOREPLACE/) {

-       $_=qq{my \$installdir="$prefix";};
+       $_=qq{our \$installdir="$prefix";};

 }
 elsif (/VERSION_AUTOREPLACE/) {
        $_=qq{our \$version="$ver";};
 }
 elsif (/^use lib/) {
 }
 elsif (/VERSION_AUTOREPLACE/) {
        $_=qq{our \$version="$ver";};
 }
 elsif (/^use lib/) {

-       $_="";
+       # 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 {
+               $_="use lib '$libdir';\n";
+       }
+}
+elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) {
+       $_=qq{$1 -T\n};
+}
+elsif (/^\$ENV\{PATH}="(.*)";/) {
+       $_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";

 }
 }