aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile.PL6
-rw-r--r--doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn5
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 38db20d44..794a2ed47 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,7 +36,7 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
chmod +x $@
ikiwiki.setup: ikiwiki.out
- HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+ PERL5LIB=. HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -dumpsetup ikiwiki.setup
extra_build: $(outprogs) ikiwiki.setup docwiki
./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@@ -50,10 +50,10 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
rm -f ikiwiki.spec.bkp
docwiki: ikiwiki.out
- $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+ PERL5LIB=. $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
extra_clean:
- $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
+ PERL5LIB=. $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
$(MAKE) -C po clean
diff --git a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
index b11972165..7b252031b 100644
--- a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
+++ b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -24,3 +24,8 @@ if I first remove the old ikiwiki installation, nor does it fail with
3.20100403 or newer installed at /opt/ikiwiki. Hence this is not
really a critical bug, although it's somewhat perplexing to me why it
ought to make a difference.
+
+> So, using INSTALL_BASE causes a 'use lib' to be hardcoded into the `.out`
+> files; which overrides the -libdir and the -I, and so the old version
+> of IkiWiki.pm is used.
+> [[fixed|done]] --[[Joey]]