another problem with this

[ikiwiki.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 985c944ad4c97a265ffd6b4b4c5783edb884dfd0..1add3cf1c17fe538109c480e1ef1491179e8f87b 100755 (executable)
--- 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,12 +49,23 @@ 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; \
                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