X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d14bde197eb0704c4172ad7113cc9c739487e724..19d8acaa95ee252e3ca2bff956ad8b5d951f1381:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 6162743f3..a805f41a2 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -24,28 +24,34 @@ PROBABLE_INST_LIB=$(shell \\
 )
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
 
 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 -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
-	if [ "$$PROFILE" = 1 ]; then dprofpp; fi
+	$(MAKE) -C po mo
 
 extra_clean:
 	rm -rf html doc/.ikiwiki
-	rm -f *.man ikiwiki.out
+	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; \
@@ -61,8 +67,8 @@ extra_install:
 	done
 	
 	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-	for file in `find plugins -maxdepth 1 -type f`; do \
-		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
+		cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
 	done; \
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
@@ -100,7 +106,6 @@ WriteMakefile(
 		'HTML::Template'	=> 0,
 		'HTML::Scrubber'	=> 0,
 		'CGI::FormBuilder'	=> 3.02.02,
-		'Time::Duration'	=> 0,
 		'CGI::Session'		=> 0,
 		'Mail::Sendmail'	=> 0,
 		'HTML::Parser'		=> 0,