summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-07 14:02:52 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-07 14:02:52 -0400
commit4291f2e3d7d1eb160427764e622d247145652e81 (patch)
tree3c4650584a4eb2bfebc99750fdc63d5da87d61e1
parent9f5f5543bf74362cacaa7eec10d9116b41b8179d (diff)
Allow underlaydir to be overridden without messing up inclusion of other underlays via add_underlay.
-rw-r--r--IkiWiki.pm9
-rw-r--r--debian/changelog2
2 files changed, 10 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index e6efe1889..6233d2ead 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -157,6 +157,13 @@ sub getsetup () {
safe => 0, # path
rebuild => 0,
},
+ underlaydirbase => {
+ type => "internal",
+ default => "$installdir/share/ikiwiki",
+ description => "parent directory containing additional underlays",
+ safe => 0,
+ rebuild => 0,
+ },
wrappers => {
type => "internal",
default => [],
@@ -715,7 +722,7 @@ sub add_underlay ($) {
my $dir=shift;
if ($dir !~ /^\//) {
- $dir="$config{underlaydir}/../$dir";
+ $dir="$config{underlaydirbase}/$dir";
}
if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
diff --git a/debian/changelog b/debian/changelog
index 36f4c16fd..d8c67b5a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.13) UNRELEASED; urgency=low
* ikiwiki-transition: If passed a nonexistant srcdir, or one not
containing .ikiwiki, abort with an error rather than creating it.
+ * Allow underlaydir to be overridden without messing up inclusion
+ of other underlays via add_underlay.
-- Joey Hess <joeyh@debian.org> Wed, 06 May 2009 20:45:44 -0400