web commit by http://ptecza.myopenid.com/: * Thanks

[git.ikiwiki.info.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 676ba06ef94d7e25e7dbb97fd0a6f140bc1d89f2..5514a98ceb67615cd40af8fae7412cfea9b647be 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,7 +30,7 @@ extra_build:
        ./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 \
        ./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 \
+               --underlaydir=basewiki --nousedirs\

                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \


@@ -47,8 +47,12 @@ extra_clean:
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 
 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 `find basewiki 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)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1