cherry-pick uri security fix

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

diff --git a/Makefile.PL b/Makefile.PL
index 130484a7c1035185168da1b963dbdbebb3db5981..49fac1adecbfa1e57ac85414bd7b661366568e53 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,21 +31,17 @@ ikiwiki.out: ikiwiki.in
        chmod +x ikiwiki.out
 
 extra_build: 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 -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 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-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
        $(MAKE) -C po
        if [ "$$PROFILE" = 1 ]; then dprofpp; fi
 
 extra_clean:
        rm -rf html doc/.ikiwiki
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
        $(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-update-wikilist.man ikiwiki.out
+       rm -f *.man ikiwiki.out

        $(MAKE) -C po clean
 
 extra_install:
        $(MAKE) -C po clean
 
 extra_install:


@@ -70,6 +66,7 @@ extra_install:
 
        install -d $(DESTDIR)$(PREFIX)/share/man/man1
        install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
 
        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-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8
        install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
        
        install -d $(DESTDIR)$(PREFIX)/share/man/man8


@@ -83,8 +80,9 @@ 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

+       install ikiwiki-makerepo ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/

 
 

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

 }
 }
 
 }
 }
 


@@ -105,5 +103,6 @@ WriteMakefile(
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,
                'URI'                   => 0,
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,
                'URI'                   => 0,

+               'Data::Dumper'          => 2.11,

        },
 );
        },
 );