Merge branch 'master' into pedigree

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

diff --git a/Makefile.PL b/Makefile.PL
index d40cf3d56976fa386d45086324b06056b375765d..8c7ac70190ad26eba142abe79bb3a703036dd27e 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,29 +23,26 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
-tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
+tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
 
 ikiwiki.out: ikiwiki.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-       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 \
-               --plugin=haiku --plugin=polygen --plugin=fortune
+       $(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
+       ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
-       $(MAKE) -C po
-       if [ "$$PROFILE" = 1 ]; then dprofpp; fi
+       $(MAKE) -C po mo
 
 extra_clean:
        rm -rf html doc/.ikiwiki
-       rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki-update-wikilist.man ikiwiki.out
+       rm -f *.man ikiwiki.out
+       rm -f plugins/*.pyc
        $(MAKE) -C po clean
 
 extra_install:
@@ -64,12 +61,14 @@ 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; \
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+       install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1
+       install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1
        install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8
@@ -83,6 +82,7 @@ extra_install:
 
        install -d $(DESTDIR)$(PREFIX)/bin
        install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
+       install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
 
        $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 }
@@ -100,10 +100,10 @@ WriteMakefile(
                'HTML::Template'        => 0,
                'HTML::Scrubber'        => 0,
                'CGI::FormBuilder'      => 3.02.02,
-               'Time::Duration'        => 0,
                'CGI::Session'          => 0,
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,
                'URI'                   => 0,
+               'Data::Dumper'          => 2.11,
        },
 );