caps

[git.ikiwiki.info.git] / pm_filter

diff --git a/pm_filter b/pm_filter
index 6c745e1f8c007e5a2a0d38c46c367b27cfa1aeed..5ee5a1b9890d8b2b60ae67686aa1f841a7531d01 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -13,7 +13,12 @@ elsif (/VERSION_AUTOREPLACE/) {
        $_=qq{our \$version="$ver";};
 }
 elsif (/^use lib/) {
        $_=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 {
                $_="";
        }
        else {


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