X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/eaf2b6429bd42707030ad22dc26dec4f4c5d302b..f7601954a862afd4c5a5b9ba83480af0472e1cf9:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 5c450e619..020813177 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,7 +27,7 @@ PROBABLE_INST_LIB=$(shell \\
 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
 
 ikiwiki.out: ikiwiki.in
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
@@ -42,7 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
 	./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 mo
+	$(MAKE) -C po
 	
 docwiki: ikiwiki.out
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
@@ -52,7 +52,7 @@ extra_clean:
 	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
-extra_install:
+underlay_install:
 	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; \
@@ -70,6 +70,7 @@ extra_install:
 		fi \
 	done
 	
+extra_install: underlay_install
 	# Install example sites.
 	for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
@@ -130,16 +131,16 @@ WriteMakefile(
 	PM_FILTER	=> './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
 	MAN1PODS	=> {},
 	PREREQ_PM	=> {
-		'XML::Simple'		=> 0,
-		'Text::Markdown'	=> 0,
-		'Date::Parse'		=> 0,
-		'HTML::Template'	=> 0,
-		'HTML::Scrubber'	=> 0,
-		'CGI::FormBuilder'	=> 3.02.02,
-		'CGI::Session'		=> 0,
-		'Mail::Sendmail'	=> 0,
-		'HTML::Parser'		=> 0,
-		'URI'			=> 0,
-		'Data::Dumper'		=> 2.11,
+		'XML::Simple'		=> "0",
+		'Text::Markdown'	=> "0",
+		'Date::Parse'		=> "0",
+		'HTML::Template'	=> "0",
+		'HTML::Scrubber'	=> "0",
+		'CGI::FormBuilder'	=> "3.02.02",
+		'CGI::Session'		=> "0",
+		'Mail::Sendmail'	=> "0",
+		'HTML::Parser'		=> "0",
+		'URI'			=> "0",
+		'Data::Dumper'		=> "2.11",
 	},
 );