From 539443a49798f3ee1d9d3da660d8f88134822a64 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 10 Mar 2012 02:10:08 +0100
Subject: Restructure (again again) init dependencies.

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4e287aa..dd996fe 100644
--- a/Makefile
+++ b/Makefile
@@ -25,19 +25,21 @@ avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null ||
 
 iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup)
 
-init: $(iki_configfiles) content
+init: shared/.git content
+	$(MAKE) $(iki_configfiles)
 
 shared/.git:
 	git submodule init
 	git submodule update --init --recursive
 
+configfiles: $(iki_configfiles)
 $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%))
-$(iki_configfiles): % : %.in shared/.git
+$(iki_configfiles): % : %.in
 	$(if $(wildcard config),,mkdir config)
 	ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@
 
 content: notempty = $(wildcard $@/*.mdwn)
-content: shared/.git
+content:
 	$(if $(notempty),,mkdir -p '$@')
 	$(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn')
 
@@ -45,4 +47,4 @@ build:
 	$(if $(cssprojects),$(MAKE) $(cssprojects))
 	$(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild);)
 
-.PHONY: all build
+.PHONY: all build configfiles
-- 
cgit v1.2.3


From 3dfb101d32c005d1d5c7c9e41e22031b2b7080ed Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 1 Aug 2012 12:06:36 +0200
Subject: Fix bootstrapping with no initial ikiwiki config.

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index dd996fe..1fb0d33 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,13 @@ shared/.git:
 	git submodule init
 	git submodule update --init --recursive
 
+config/ikiwiki.setup.in:
+	$(if $(wildcard config),,mkdir config)
+	$(if $(wildcard config/ikiwiki.setup.in),,touch config/ikiwiki.setup.in)
+
 configfiles: $(iki_configfiles)
 $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%))
 $(iki_configfiles): % : %.in
-	$(if $(wildcard config),,mkdir config)
 	ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@
 
 content: notempty = $(wildcard $@/*.mdwn)
-- 
cgit v1.2.3


From cc4bcbadbbabb468dd0f78149bc2f227393dd57c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 4 Aug 2012 19:44:45 +0200
Subject: Drop IKIWIKI_SHARED_OPTIONS (merge into IKIWIKI_SHARED_DEFAULTS.

---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1fb0d33..39dcbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,14 @@ IKIWIKI_DEFAULTS ?= \
  --rcs git \
  --set cgi_wrappermode=00755 \
  --set git_wrappermode=06755 \
+ --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_DEFAULTS)
 
-IKIWIKI_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)
+export CURDIR
 
 cssprojects ?= $(wildcard shared/themes/goab styling)
 
@@ -39,7 +38,8 @@ 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 $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@
+	ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@
+	perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@
 
 content: notempty = $(wildcard $@/*.mdwn)
 content:
-- 
cgit v1.2.3