summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2015-02-27 18:33:58 +0100
committerJonas Smedegaard <dr@jones.dk>2015-03-14 16:58:49 +0100
commit9885704e8f46ff49e231ae78945394eef4d37a79 (patch)
treef67a7feb30542ed715f29dd58aff98a42eedf454
parentd8ebe286c96f329a5894340c4f5643ca55e1094d (diff)
Handle IKIWIKI_SHARED_UNDERLAYS (in addition to IKIWIKI_UNDERLAYS).
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
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' $@