Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

[ikiwiki.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 7608d373c8e6623ad2fcffc546f25fd11f491092..dad0fedcad58424157ee9d3dfbb259a48ae7b14a 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,7 +23,7 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
-tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 ikiwiki.out: ikiwiki.in
@@ -31,7 +31,7 @@ ikiwiki.out: ikiwiki.in
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-       perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
+       perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
@@ -43,6 +43,7 @@ extra_build: ikiwiki.out
 extra_clean:
        rm -rf html doc/.ikiwiki
        rm -f *.man ikiwiki.out
+       rm -f plugins/*.pyc
        $(MAKE) -C po clean
 
 extra_install:
@@ -61,7 +62,7 @@ extra_install:
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
-       for file in `find plugins -maxdepth 1 -type f`; do \
+       for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done; \