From 9885704e8f46ff49e231ae78945394eef4d37a79 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:33:58 +0100
Subject: Handle IKIWIKI_SHARED_UNDERLAYS (in addition to IKIWIKI_UNDERLAYS).

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c0ab3ed..4217275 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,11 @@ configfiles: $(iki_configfiles)
 $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%))
 $(iki_configfiles): % : %.in
 	ikiwiki $(IKIWIKI_DEFAULTS) \
-		$(if $(IKIWIKI_UNDERLAYS),--set-yaml add_underlays="$$(echo $(IKIWIKI_UNDERLAYS) | perl -pe 's/\s+/\n/g;s/^/- /gm')") \
+		$(if $(IKIWIKI_UNDERLAYS)$(IKIWIKI_SHARED_UNDERLAYS),\
+			--set-yaml add_underlays="$$(echo $(strip \
+				$(IKIWIKI_UNDERLAYS) \
+				$(IKIWIKI_SHARED_UNDERLAYS)) \
+			| perl -pe 's/\s+/\n/g;s/^/- /gm')") \
 		$(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@
 	perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@
 
-- 
cgit v1.2.3