diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-20 01:04:24 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-20 01:04:24 +0000 |
| commit | 05fbbad4b4d256b34b2574d98a0cf1203121b782 (patch) | |
| tree | c40bfdde870764f27380a713dfd87528b150cc5e | |
| parent | d3d528b5c4e61ade7153df8f3d60cf651c39e5e1 (diff) | |
build fixes
| -rwxr-xr-x | Makefile.PL | 4 | ||||
| -rw-r--r-- | t/basewiki_brokenlinks.t | 6 |
2 files changed, 6 insertions, 4 deletions
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"); |