From cf92a6b4a6ec9f8025fd3847ec4c2d7cd7c3ddac Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:56:54 +0100 Subject: Generate Ikiwiki setup files from defaults, hardcoding (path) options and optional *.in YAML file. --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ad06556..4e287aa 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,16 @@ +IKIWIKI_DEFAULTS ?= \ + --rcs git \ + --set cgi_wrappermode=00755 \ + --set git_wrappermode=06755 \ + $(IKIWIKI_SHARED_DEFAULTS) + IKIWIKI_OPTIONS ?= \ - --set srcdir='$(CURDIR)/content' \ - --set destdir='$(CURDIR)/build/html' \ - $(IKIWIKI_SHARED_OPTIONS) $(IKIWIKI_CONFIG_OPTIONS) + --set srcdir='$(CURDIR)/content' \ + --set destdir='$(CURDIR)/build/html$(iki_flavor:%=-%)' \ + --set cgi_wrapper='$(CURDIR)/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \ + --set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \ + --set wikistatedir='$(CURDIR)/.ikiwiki$(iki_flavor:%=-%)' \ + $(IKIWIKI_SHARED_OPTIONS) cssprojects ?= $(wildcard shared/themes/goab styling) @@ -22,9 +31,10 @@ shared/.git: git submodule init git submodule update --init --recursive +$(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in shared/.git $(if $(wildcard config),,mkdir config) - ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@ content: notempty = $(wildcard $@/*.mdwn) content: shared/.git -- cgit v1.2.3