build fixes

diff --git a/Makefile.PL b/Makefile.PL
index 5514a98ceb67615cd40af8fae7412cfea9b647be..985c944ad4c97a265ffd6b4b4c5783edb884dfd0 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -26,9 +26,11 @@ PROBABLE_INST_LIB=$(shell \\
 tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 
 tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)
 

-extra_build:
+ikiwiki.out: ikiwiki.in

        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out

+
+extra_build: ikiwiki.out

        LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
                --underlaydir=basewiki --nousedirs\
                --wikiname="ikiwiki" --verbose \
        LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
                --underlaydir=basewiki --nousedirs\
                --wikiname="ikiwiki" --verbose \

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index 929a560de115fe051541fa45cf8330dffd36731d..d15924036e5878508fecb5798b4b4faf990ca44b 100644 (file)
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More tests => 2;
+use Test::More tests => 3;

 
 

-my $ret=system("./ikiwiki.out -plugin brokenlinks -rebuild -underlaydir=basewiki t/basewiki_brokenlinks t/basewiki_brokenlinks/out");
-ok($ret == 0);
+ok(! system("make ikiwiki.out"));
+ok(! system("./ikiwiki.out -plugin brokenlinks -rebuild -underlaydir=basewiki t/basewiki_brokenlinks t/basewiki_brokenlinks/out"));

 ok(`grep 'no broken links' t/basewiki_brokenlinks/out/index.html`);
 system("rm -rf t/basewiki_brokenlinks/out t/basewiki_brokenlinks/.ikiwiki");
 ok(`grep 'no broken links' t/basewiki_brokenlinks/out/index.html`);
 system("rm -rf t/basewiki_brokenlinks/out t/basewiki_brokenlinks/.ikiwiki");