cherry-pick uri security fix

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

diff --git a/Makefile.PL b/Makefile.PL
index 0315b6d49bfe9bfff2a8c76eff7112601bd0a196..49fac1adecbfa1e57ac85414bd7b661366568e53 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,12 +31,7 @@ ikiwiki.out: ikiwiki.in
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-       LANG= perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-               --underlaydir=underlays/basewiki --nousedirs\
-               --wikiname="ikiwiki" --verbose \
-               --exclude=/discussion --no-discussion --userdir=users \
-               --plugin=goodstuff --plugin=version \
-               --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-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
@@ -108,5 +103,6 @@ WriteMakefile(
                'Mail::Sendmail'        => 0,
                'HTML::Parser'          => 0,
                'URI'                   => 0,
+               'Data::Dumper'          => 2.11,
        },
 );