From 4291f2e3d7d1eb160427764e622d247145652e81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 May 2009 14:02:52 -0400
Subject: Allow underlaydir to be overridden without messing up inclusion of
 other underlays via add_underlay.

---
 IkiWiki.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'IkiWiki.pm')

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}}) {
-- 
cgit v1.2.3