X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/122f6df3259e8ca1dd96554d08cebce4b5c55acc..340f2198183cf20cc08e9ad33f377d6a8fcec35b:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 7608d373c..8c7ac7019 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,26 +23,26 @@ PROBABLE_INST_LIB=$(shell \\
 	fi \\
 )
 
-tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
+tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; 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
+	$(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 plugins/*.pyc
 	$(MAKE) -C po clean
 
 extra_install:
@@ -61,7 +61,7 @@ extra_install:
 	done
 	
 	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-	for file in `find plugins -maxdepth 1 -type f`; do \
+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
 		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
 	done; \
 
@@ -100,7 +100,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,