X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3aacac3b46ba79e5e77fcd99f99f94f182283f72..HEAD:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 3022aa40e..b63ee7397 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -61,7 +61,7 @@ extra_build: perl_shebangs $(outprogs) ikiwiki.setup docwiki sysconfdir
 docwiki:
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --refresh
 
-perl_shebangs:
+perl_shebangs: pm_to_blib
 ifneq "$(PERL)" "/usr/bin/perl"
 	set -e; \
 	for file in $(shebang_scripts); do \
@@ -87,20 +87,24 @@ sysconfdir:
 extra_clean: perl_shebangs_clean
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in --setup docwiki.setup --clean
 	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
+	rm -fr t/tmp t/manual/*/git/ t/manual/*/html/ t/tinyblog/.ikiwiki/ t/tinypodcast/.ikiwiki/
 	$(MAKE) -C po clean
 
-# Joey uses this before committing.
-myclean: clean
+reset-generated:
 	git checkout po ikiwiki.spec
 
+# Joey uses this before committing.
+myclean: clean reset-generated
+
 underlay_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 	set -e; \
-	for dir in `cd underlays && $(FIND) . -follow -type d`; do \
+	for dir in `$(FIND) underlays -follow -mindepth 1 -type d | $(SED) -e 's|^underlays/||'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
 		for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name jquery.js ! -name jquery-ui.css ! -name jquery-ui.js ! -name jquery.tmpl.js`; do \
-			cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
-			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+			if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \
+				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+			fi; \
 		done; \
 	done
 
@@ -109,8 +113,9 @@ underlay_install:
 	set -e; \
 	for file in doc/ikiwiki/directive/*; do \
 		if [ -f "$$file" ]; then \
-			cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \
-			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+			if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null; then \
+				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+			fi; \
 		fi \
 	done
 
@@ -125,8 +130,9 @@ underlay_install:
 			elif echo "$$file" | grep -q base.css; then \
 				:; \
 			elif [ -f "$$file" ]; then \
-				cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
-				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+				if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null; then \
+					install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+				fi; \
 			fi \
 		done; \
 	done
@@ -134,13 +140,14 @@ underlay_install:
 extra_install: underlay_install
 	# Install example sites.
 	set -e; \
-	for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \
+	for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -ne 's|^doc/examples/||p'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
 	done
 	set -e; \
-	for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
-		cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
-		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+	for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -ne 's|^doc/examples/||p'`; do \
+		if ! cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null; then \
+			install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+		fi; \
 	done
 
 	set -e; \
@@ -199,6 +206,9 @@ coverage:
 	cover -delete
 	$(MAKE) test PERL5OPT=-MDevel::Cover PERL5LIB=. TEST_FILES="$(filter-out t/git.t t/mercurial.t,$(wildcard t/*.t))"
 	cover
+
+git-dist:
+	git archive --format=tar --prefix=IkiWiki-$(VER)/ HEAD | xz -c > IkiWiki-$(VER).tar.xz
 }
 }