summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rwxr-xr-xpm_filter7
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ceb113aa1..e387af095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
ikiwiki (2.47) UNRELEASED; urgency=low
* mdwn: Add a multimarkdown setup file option.
+ * If PERL5LIB is set to the libdir when building ikiwiki, calculate and
+ hardcode a proper 'use lib' statement anyway. This fixes a gotcha,
+ since PERL5LIB won't work once ikiwiki is running via a wrapper or as
+ a cgi.
-- Joey Hess <joeyh@debian.org> Tue, 13 May 2008 12:30:18 -0400
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 {