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

switch to PERL5LIB so that use lib inserted for INSTALL_BASE is overridden during build

master
Joey Hess 2010-04-22 23:00:33 -04:00
parent 83dc7d2574
commit 5bc7efab7c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.PL
View File

@ -36,7 +36,7 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
chmod +x $@ chmod +x $@
ikiwiki.setup: ikiwiki.out 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 extra_build: $(outprogs) ikiwiki.setup docwiki
./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@ -50,10 +50,10 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
rm -f ikiwiki.spec.bkp rm -f ikiwiki.spec.bkp
docwiki: ikiwiki.out 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: 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 rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
$(MAKE) -C po clean $(MAKE) -C po clean

5
doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
View File

@ -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 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 really a critical bug, although it's somewhat perplexing to me why it
ought to make a difference. 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]]