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

diff --git a/Makefile.PL b/Makefile.PL
index 1fc0bf371..95e574c66 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,10 +50,6 @@ extra_clean:
 	$(MAKE) -C po clean
 
 extra_install:
-	install -d $(DESTDIR)/etc/ikiwiki
-	install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
-	install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
-
 	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; \
@@ -61,6 +57,15 @@ extra_install:
 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
 		done; \
 	done
+
+	# The directive docs become their own special underlay.
+	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
+	for file in doc/ikiwiki/directive/*; do \
+		if [ -f "$$file" ]; then \
+			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+		fi \
+	done
+
 	for dir in `find 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 \
@@ -72,7 +77,7 @@ extra_install:
 	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \
 		install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
 	done
-	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py`; do \
+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
 		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
 	done
 
@@ -96,6 +101,12 @@ extra_install:
 	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+	
+	# These might fail if a regular user is installing into a home
+	# directory.
+	-install -d $(DESTDIR)/etc/ikiwiki
+	-install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
+	-install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
 }
 }