X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dbb5d111968be2f0c4f7fb012787c67b9bac57f7..af5758049140265b22c17375ee195f6dcfbffa7b:/pm_filter diff --git a/pm_filter b/pm_filter index 6c745e1f8..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 { @@ -23,6 +28,6 @@ elsif (/^use lib/) { 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"; }