diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-05-07 14:02:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-05-07 14:02:52 -0400 |
| commit | 4291f2e3d7d1eb160427764e622d247145652e81 (patch) | |
| tree | 3c4650584a4eb2bfebc99750fdc63d5da87d61e1 /IkiWiki.pm | |
| parent | 9f5f5543bf74362cacaa7eec10d9116b41b8179d (diff) | |
| download | ikiwiki-4291f2e3d7d1eb160427764e622d247145652e81.tar ikiwiki-4291f2e3d7d1eb160427764e622d247145652e81.tar.gz | |
Allow underlaydir to be overridden without messing up inclusion of other underlays via add_underlay.
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 9 |
1 files changed, 8 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}}) { |