From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 20 May 2007 01:04:24 +0000 (+0000)
Subject: build fixes
X-Git-Tag: 2.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=05fbbad4b4d256b34b2574d98a0cf1203121b782;p=ikiwiki.git

build fixes
---

diff --git a/Makefile.PL b/Makefile.PL
index 5514a98ce..985c944ad 100755
--- 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)
 
-extra_build:
+ikiwiki.out: ikiwiki.in
 	./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 \
diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index 929a560de..d15924036 100644
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -1,9 +1,9 @@
 #!/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");