X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/506bcbac0420a46997ad531961d543e62c011513..ce854a973cf2f4291d7f35c16182e710a2e5fb29:/Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 0e306ac08..1add3cf1c 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,8 +31,8 @@ ikiwiki.out: ikiwiki.in
 	chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-	LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-		--underlaydir=basewiki --nousedirs\
+	LANG= perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
+		--underlaydir=underlays/basewiki --nousedirs\
 		--wikiname="ikiwiki" --verbose \
 		--exclude=/discussion --no-discussion --userdir=users \
 		--plugin=goodstuff \
@@ -49,7 +49,13 @@ extra_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; \