X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d494bbcb34addf068e4ed830b57d37f6ba8b8217..0b977fa22cabf8e1050857412123015c07c30c19:/Makefile.PL?ds=sidebyside

diff --git a/Makefile.PL b/Makefile.PL
index 676ba06ef..1add3cf1c 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,11 +26,13 @@ PROBABLE_INST_LIB=$(shell \\
 tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
-extra_build:
+ikiwiki.out: ikiwiki.in
 	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
 	chmod +x ikiwiki.out
-	LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-		--underlaydir=basewiki \
+
+extra_build: ikiwiki.out
+	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 \
@@ -47,8 +49,23 @@ extra_clean:
 
 extra_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
-	find basewiki templates \( -type f -or -type l \) ! -regex '.*\.svn.*' \
-		-exec cp --parents -aL {} $(DESTDIR)$(PREFIX)/share/ikiwiki \;
+	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; \
+		done; \
+	done
+	
+	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
+	for file in `find plugins -maxdepth 1 -type f`; do \
+		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
+	done; \
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1