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

diff --git a/Makefile.PL b/Makefile.PL
index 6f1724697..2df9ae1a6 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -87,16 +87,19 @@ 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 \
 			if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \
@@ -137,11 +140,11 @@ 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) -e 's|^doc/examples/||'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
 	done
 	set -e; \
-	for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
+	for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; 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; \
@@ -203,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
 }
 }