diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
| commit | 7bba52254569047ef1d9f5752096f155b0a2be77 (patch) | |
| tree | 0c79effe8cbf7847e36557e4ed9fe10d08728a33 /Makefile.PL | |
| parent | 6486452e4c94f5699d98d13e25a361435ed3ddeb (diff) | |
| parent | d822e37d0efc34f2267f275030de11cd3c7ff7bb (diff) | |
| download | ikiwiki-7bba52254569047ef1d9f5752096f155b0a2be77.tar ikiwiki-7bba52254569047ef1d9f5752096f155b0a2be77.tar.gz | |
Merge branch 'master' into templatemove
Conflicts:
doc/templates.mdwn
Diffstat (limited to 'Makefile.PL')
| -rwxr-xr-x | Makefile.PL | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.PL b/Makefile.PL index 09ec2e730..4001c841b 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -35,8 +35,8 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@ chmod +x $@ -ikiwiki.setup: ikiwiki.out - HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup +ikiwiki.setup: + HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup extra_build: $(outprogs) ikiwiki.setup docwiki ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man @@ -49,11 +49,11 @@ extra_build: $(outprogs) ikiwiki.setup docwiki sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec rm -f ikiwiki.spec.bkp -docwiki: ikiwiki.out - $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh +docwiki: + $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh extra_clean: - $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean + $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc $(MAKE) -C po clean |