X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/7946c67d1f7538a2b131c7b79205527f86e9002c..685485ed3d2aa16bc0ed43974f226686544d83e6:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index aba4239d8..d40cf3d56 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -32,24 +32,31 @@ ikiwiki.out: ikiwiki.in
 
 extra_build: ikiwiki.out
 	LANG= perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-		--underlaydir=basewiki --nousedirs\
+		--underlaydir=underlays/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
+	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
 	$(MAKE) -C po
 	if [ "$$PROFILE" = 1 ]; then dprofpp; fi
 
 extra_clean:
 	rm -rf html doc/.ikiwiki
-	rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
+	rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki-update-wikilist.man ikiwiki.out
 	$(MAKE) -C po clean
 
 extra_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
-	for dir in `find basewiki templates -follow -type d ! -regex '.*\.svn.*'`; do \
+	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
+		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+		for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
+			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+		done; \
+	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 \
 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
@@ -63,6 +70,7 @@ extra_install:
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
 	
 	install -d $(DESTDIR)$(PREFIX)/share/man/man8
 	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
@@ -76,7 +84,7 @@ extra_install:
 	install -d $(DESTDIR)$(PREFIX)/bin
 	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
 
-	$(MAKE) -C po install PREFIX=$(PREFIX)
+	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 }
 }