From 6fd62b76bfdfb9771c2ec270e4619191f0a54a7e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:07:41 +0100 Subject: Add IKIWIKI_UNDERLAYS for multiple underlays. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b835f64..cff0333 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,9 @@ configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) \ + $(if $(IKIWIKI_UNDERLAYS),--set-yaml add_underlays="$$(echo $(IKIWIKI_UNDERLAYS) | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ + $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@ content: notempty = $(wildcard $@/*.mdwn) -- cgit v1.2.3 From d8ebe286c96f329a5894340c4f5643ca55e1094d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:26:17 +0100 Subject: Fix generate ikiwiki setup only once. --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cff0333..c0ab3ed 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ config/ikiwiki.setup.in: configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in - ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ ikiwiki $(IKIWIKI_DEFAULTS) \ $(if $(IKIWIKI_UNDERLAYS),--set-yaml add_underlays="$$(echo $(IKIWIKI_UNDERLAYS) | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ -- cgit v1.2.3 From 9885704e8f46ff49e231ae78945394eef4d37a79 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard 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