no, it's fixed after all..

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

diff --git a/Makefile.PL b/Makefile.PL
index 8404f947744c3f7f3165dea88eda56fb67593015..985c944ad4c97a265ffd6b4b4c5783edb884dfd0 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,18 +23,24 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
-extra_build:
+tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
+
+ikiwiki.out: ikiwiki.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
-       PERL5LIB=.:${PERL5LIB} LANG=C ./ikiwiki.in doc html --templatedir=templates \
-               --underlaydir=basewiki \
-               --wikiname="ikiwiki" --verbose --no-rcs \
+
+extra_build: ikiwiki.out
+       LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
+               --underlaydir=basewiki --nousedirs\
+               --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \
                --plugin=haiku --plugin=polygen --plugin=fortune
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        $(MAKE) -C po
+       if [ "$$PROFILE" = 1 ]; then dprofpp; fi
 
 extra_clean:
        rm -rf html doc/.ikiwiki
@@ -42,11 +48,13 @@ extra_clean:
        $(MAKE) -C po clean
 
 extra_install:
-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-       $(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
-
-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
-       $(CP) -aL basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+       install -d $(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