web commit from 213.41.241.71: poll vote (It's fast enough)

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

diff --git a/Makefile.PL b/Makefile.PL
index 4f6b051797f72a6a3e7671b321ce0c6d340954ba..985c944ad4c97a265ffd6b4b4c5783edb884dfd0 100755 (executable)
--- 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
+
+extra_build: 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 \
@@ -42,13 +44,17 @@ extra_build:
 
 extra_clean:
        rm -rf html doc/.ikiwiki
-       rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out tmon.out
+       rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
        $(MAKE) -C po 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 `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