no, it's fixed after all..

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

diff --git a/Makefile.PL b/Makefile.PL
index 6e75097c899c50919a9a3d9db97bf353cd052023..985c944ad4c97a265ffd6b4b4c5783edb884dfd0 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,35 +23,44 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
        fi \\
 )
 

-extra_build:
-       ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \
-               --wikiname="ikiwiki" --verbose --no-rcs \
-               --exclude=/discussion --no-discussion \
-               --plugin=brokenlinks --plugin=pagecount \
-               --plugin=orphans --plugin=haiku --plugin=meta \
-               --plugin=tag --plugin=polygen --plugin=pagestats \
-               --plugin=fortune --plugin=aggregate --plugin=map \
-               --plugin=template --plugin=toc --plugin=shortcut
+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
+
+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
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man

-       ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
-               
+       $(MAKE) -C po
+       if [ "$$PROFILE" = 1 ]; then dprofpp; fi
+

 extra_clean:
        rm -rf html doc/.ikiwiki
        rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
 extra_clean:
        rm -rf html doc/.ikiwiki
        rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out

+       $(MAKE) -C po clean

 
 extra_install:
 
 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) -a 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 -d $(DESTDIR)$(PREFIX)/share/man/man1

-       install ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
+       install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1

        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8
        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8

-       install ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
+       install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8

        
        install -d $(DESTDIR)$(PREFIX)/sbin
        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
        
        install -d $(DESTDIR)$(PREFIX)/sbin
        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin


@@ -61,6 +70,8 @@ extra_install:
 
        install -d $(DESTDIR)$(PREFIX)/bin
        install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
 
        install -d $(DESTDIR)$(PREFIX)/bin
        install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki

+
+       $(MAKE) -C po install PREFIX=$(PREFIX)

 }
 }
 
 }
 }
 


@@ -69,4 +80,17 @@ WriteMakefile(
        PREFIX          => "/usr/local",
        PM_FILTER       => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
        MAN1PODS        => {},
        PREFIX          => "/usr/local",
        PM_FILTER       => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
        MAN1PODS        => {},

+       PREREQ_PM       => {
+               'XML::Simple'           => 0,
+               'Text::Markdown'        => 0,
+               'Date::Parse'           => 0,
+               '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,
+       },

 );
 );