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

diff --git a/Makefile.PL b/Makefile.PL
index 7b55c7025..b63ee7397 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -87,12 +87,15 @@ 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; \
@@ -137,11 +140,11 @@ underlay_install:
 extra_install: underlay_install
 	# Install example sites.
 	set -e; \
-	for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; 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 `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
+	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; \