fixes

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index dcb278bf48e2e7faae969cba7515e9ace98e149f..0e091b994134fcce7d3b4d59ffd0504e9712b4f8 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,13 +7,12 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
 sub import { #{{{
        $IkiWiki::Setup::raw_setup=$_[1];
 } #}}}
 
-package IkiWiki::Setup;
-
 sub dumpline ($$$) { #{{{
        my $key=shift;
        my $value=shift;

diff --git a/ikiwiki.in b/ikiwiki.in
index 0f82f77ac538a90cc8c7d7c3d3c6ab9f1433bb00..8066bbc6e096d0ab51a5fb72f97d642042e1ccaf 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -149,9 +149,8 @@ sub main () { #{{{
        }
 
        if ($config{dumpsetup}) {
-               loadplugins();
-               checkconfig();
-               IkiWiki::Setup::dump($config{dumpsetup});
+               require IkiWiki::Setup::Standard;
+               IkiWiki::Setup::Standard::dump($config{dumpsetup});
        }
        elsif ($config{wrapper}) {
                lockwiki();