X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b37070d888919ae30219ce13e4d3cce359fd75e1..994c242994e54c98c2dad665a5fdbccc6fe0bdeb:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 7f715eb87..b27e6cef3 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,9 +13,6 @@ pure_install:: extra_install
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 
-ikiwiki: ikiwiki.pl
-	./pm_filter $(PREFIX) $(VER) < ikiwiki.pl > ikiwiki
-
 extra_build:
 	./ikiwiki.pl doc html --templatedir=templates --underlaydir=basewiki \
 		--wikiname="ikiwiki" --verbose --no-rcs \
@@ -24,20 +21,21 @@ extra_build:
 		--plugin=orphans --plugin=haiku --plugin=meta \
 		--plugin=tag --plugin=polygen --plugin=pagestats \
 		--plugin=fortune --plugin=aggregate --plugin=map \
-		--plugin=template
+		--plugin=template --plugin=toc
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
+	./pm_filter $(PREFIX) $(VER) < ikiwiki.pl > ikiwiki.out
 		
 extra_clean:
 	rm -rf html doc/.ikiwiki
-	rm -f ikiwiki.man ikiwiki-mass-rebuild.man
+	rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
 
 extra_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-	cp templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
+	$(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
 
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
-	cp -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+	$(CP) -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
@@ -50,6 +48,9 @@ extra_install:
 
 	install -d $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
 	install ikiwiki-w3m.cgi $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
+
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
 }
 }
 
@@ -57,7 +58,5 @@ WriteMakefile(
 	NAME		=> 'IkiWiki',
 	PREFIX		=> "/usr/local",
 	PM_FILTER	=> './pm_filter $(PREFIX) $(VER)',
-	EXE_FILES	=> ['ikiwiki'],
 	MAN1PODS	=> {},
-	clean		=> {FILES => 'ikiwiki'},
 );