web commit by http://ethan.betacantrips.com/: revised patch (completely untested...

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

diff --git a/Makefile.PL b/Makefile.PL
index b02eb15b04495c90892eee5916f448c51157ae9b..3c47e684e7c26ca5f40f781fe97e54efa38bf4de 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,32 +23,38 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
        fi \\
 )
 

+tflag=$(shell if [ ! "$$NOTAINT" ]; then printf -- "-T"; fi)
+

 extra_build:
 extra_build:

-       ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \
-               --wikiname="ikiwiki" --verbose --no-rcs \
-               --exclude=/discussion --no-discussion \
-               --plugin=nicebundle \
+       ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
+       chmod +x ikiwiki.out
+       LANG=C perl -I. $(tflag) ikiwiki.out doc html --templatedir=templates \
+               --underlaydir=basewiki \
+               --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
                --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

-       ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
-               
+       $(MAKE) -C po
+

 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:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
        $(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
 
 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
+       $(CP) -aL basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki

 
        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


@@ -58,6 +64,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)

 }
 }
 
 }
 }
 


@@ -66,4 +74,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,
+       },

 );
 );