X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=Makefile.PL;h=a805f41a244ec1d473b0e626ad04940ab608eab5;hp=ba437e3f656175908fe4d565b587569ed2a7bc7a;hb=12c5786df4e74c143f24398b8d0028000b61daba;hpb=f030bce812f0c91616f5eaf5860df6299f09f5eb

diff --git a/Makefile.PL b/Makefile.PL
index ba437e3f6..a805f41a2 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,22 +30,28 @@ ikiwiki.out: ikiwiki.in
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
 	chmod +x ikiwiki.out
 
-extra_build: ikiwiki.out
-	perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+ikiwiki.setup: ikiwiki.out
+	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+
+extra_build: ikiwiki.out ikiwiki.setup
+	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
 	./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
-	$(MAKE) -C po
+	$(MAKE) -C po mo
 
 extra_clean:
 	rm -rf html doc/.ikiwiki
-	rm -f *.man ikiwiki.out
-	rm -f plugins/*.pyc
+	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
 extra_install:
+	install -d $(DESTDIR)/etc/ikiwiki
+	install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
+	install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
+
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
@@ -62,7 +68,7 @@ extra_install:
 	
 	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
 	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
-		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+		cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
 	done; \
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1