urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

master
Joey Hess 2008-05-14 02:42:01 -04:00
parent 6cc69038ca
commit 2c6f41e59c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -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

7
pm_filter
View File

@ -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 {