updates for usedirs

diff --git a/Makefile.PL b/Makefile.PL
index 43af95c59c4916ffaf8196c581b905c499dba154..73c4950cb436c603152b56b4027975087727f5c1 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,7 +30,7 @@ extra_build:
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
        chmod +x ikiwiki.out
        LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-               --underlaydir=basewiki \
+               --underlaydir=basewiki --nousedirs\
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --plugin=goodstuff \

diff --git a/t/linkify.t b/t/linkify.t
index 962456c30c2930779c98966e1783da0234ff1045..c7bfbcd382c30c5e15cddd725efc94e3553e3ec1 100755 (executable)
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -5,6 +5,9 @@ use Test::More tests => 16;
 
 BEGIN { use_ok("IkiWiki"); }
 
+# currently coded for non usedirs mode (TODO: check both)
+$config{usedirs}=0;
+
 sub linkify ($$$$) {
        my $lpage=shift;
        my $page=shift;