response, and change setup instuctions for svn. The other rcses seem ok,

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

diff --git a/Makefile.PL b/Makefile.PL
index cdf28f16effce8bc6c42c8e586f620bfb69bdcd1..9786a66cec26062e858ea113bc4c9a52a4a4666a 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,35 +13,44 @@ pure_install:: extra_install
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 

+PROBABLE_INST_LIB=$(shell \\
+       if [ "$(INSTALLDIRS)" = "perl" ]; then \\
+               echo $(INSTALLPRIVLIB); \\
+       elif [ "$(INSTALLDIRS)" = "site" ]; then \\
+               echo $(INSTALLSITELIB); \\
+       elif [ "$(INSTALLDIRS)" = "vendor" ]; then \\
+               echo $(INSTALLVENDORLIB); \\
+       fi \\
+)
+

 extra_build:
 extra_build:

-       ./ikiwiki.pl doc html --templatedir=templates --underlaydir=basewiki \
+       ./ikiwiki.in doc html --templatedir=templates --underlaydir=basewiki \

                --wikiname="ikiwiki" --verbose --no-rcs \
                --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
+               --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) < ikiwiki.pl > ikiwiki.out
-               
+       ./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
 
 extra_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/templates

-       cp templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates
+       $(CP) -a templates/* $(DESTDIR)$(PREFIX)/share/ikiwiki/templates

 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki

-       cp -a basewiki/* $(DESTDIR)$(PREFIX)/share/ikiwiki/basewiki
+       $(CP) -a 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


@@ -51,13 +60,14 @@ 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)

 }
 }
 
 WriteMakefile(
        NAME            => 'IkiWiki',
        PREFIX          => "/usr/local",
 }
 }
 
 WriteMakefile(
        NAME            => 'IkiWiki',
        PREFIX          => "/usr/local",

-       PM_FILTER       => './pm_filter $(PREFIX) $(VER)',
+       PM_FILTER       => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',

        MAN1PODS        => {},
        MAN1PODS        => {},

-       clean           => {FILES => 'ikiwiki'},

 );
 );