summaryrefslogtreecommitdiff
path: root/Makefile
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:47:21 +0100
commit699f2014f558490a97e2ce91bfd6a371c322cea6 (patch)
treed00e962dad85070afa4a85451329292fe6e5cbd0 /Makefile
parent5306cf25be0a868fe467729a1ed6abb9d8e12e44 (diff)
Handle IKIWIKI_SHARED_UNDERLAYS (in addition to IKIWIKI_UNDERLAYS).
Diffstat (limited to 'Makefile')
-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' $@