X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fe350344ca56555ed89b6919e39933b08944c452..dab5e8e38b33d96d9d44345ccc1aec11bbc756fe:/Makefile.PL?ds=sidebyside

diff --git a/Makefile.PL b/Makefile.PL
index 0039d1bc0..5514a98ce 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,20 +23,22 @@ PROBABLE_INST_LIB=$(shell \\
 	fi \\
 )
 
-tflag=$(shell if [ ! "$$NOTAINT" ]; then printf -- "-T"; fi)
+tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 extra_build:
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
 	chmod +x ikiwiki.out
-	LANG=C perl -I. $(tflag) ikiwiki.out doc html --templatedir=templates \
-		--underlaydir=basewiki \
-		--wikiname="ikiwiki" --verbose --no-rcs \
+	LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
+		--underlaydir=basewiki --nousedirs\
+		--wikiname="ikiwiki" --verbose \
 		--exclude=/discussion --no-discussion --userdir=users \
 		--plugin=goodstuff \
 		--plugin=haiku --plugin=polygen --plugin=fortune
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
 	$(MAKE) -C po
+	if [ "$$PROFILE" = 1 ]; then dprofpp; fi
 
 extra_clean:
 	rm -rf html doc/.ikiwiki
@@ -44,11 +46,13 @@ extra_clean:
 	$(MAKE) -C po clean
 
 extra_install:
-	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-	$(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-
-	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
-	$(CP) -aL basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+	for dir in `find basewiki templates -follow -type d ! -regex '.*\.svn.*'`; do \
+		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+		for file in `find $$dir -follow -maxdepth 1 -type f`; do \
+			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+		done; \
+	done
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1