From 11332562ebb86129e8f739fdc98eec915e614df1 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 14 Oct 2011 12:56:12 +0200
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index f528fc4..e1c6164 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit f528fc43d094c41ecbb73ca13c7eb89e3a7997df
+Subproject commit e1c6164ba747f1b6871f81610750757cb8e5285c
-- 
cgit v1.2.3


From 21c0ecd2531a39f37f90f46584d3bf2eace60395 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 14 Oct 2011 13:19:41 +0200
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index e1c6164..cb2bf79 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit e1c6164ba747f1b6871f81610750757cb8e5285c
+Subproject commit cb2bf79d423df570805c7d26e6d14801c5a4e83f
-- 
cgit v1.2.3


From 385f3e458845667f99c240a7c3e1500371e03aba Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 16 Feb 2012 19:52:06 +0100
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index cb2bf79..a810041 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit cb2bf79d423df570805c7d26e6d14801c5a4e83f
+Subproject commit a810041d29f4a5eaae46249efa7871eaaece5949
-- 
cgit v1.2.3


From fafad703a35ca1e930479d0d864034957625bbce Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 23 Feb 2012 18:16:24 +0100
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index a810041..2e11ffc 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit a810041d29f4a5eaae46249efa7871eaaece5949
+Subproject commit 2e11ffc0504c48ccbd866eb7296795df75722092
-- 
cgit v1.2.3


From 109fdb263c35da12709c40b0e6f532907485ecbf Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 1 Mar 2012 01:39:19 +0100
Subject: Restructure submodules and config targets dependency handling (now
 use -B to force rebuilding).

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

diff --git a/Makefile b/Makefile
index 85f3dda..7f98f02 100644
--- a/Makefile
+++ b/Makefile
@@ -14,24 +14,24 @@ all: build
 always-make = $(filter -B,$(MAKEFLAGS))
 avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs")
 
-init: submodules content
-	$(MAKE) -B config
+init: config content
 
-submodules:
+shared/.git:
 	git submodule init
 	git submodule update --init --recursive
 
 config: setupfiles = $(wildcard $@/*.setup)
-config: submodules
+config: shared/.git
 	$(if $(setupfiles),,mkdir -p '$@')
 	$(if $(setupfiles),,ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup')
 
-content: submodules
-	mkdir -p '$@'
-	[ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn'
+content: notempty = $(wildcard $@/*.mdwn)
+content: shared/.git
+	$(if $(notempty),,mkdir -p '$@')
+	$(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn')
 
 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 submodules content
+.PHONY: all build
-- 
cgit v1.2.3


From 4f82d2a5cb3db474382865ce1fdba5b29963f88d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 1 Mar 2012 01:50:03 +0100
Subject: Individual configfile targets.

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7f98f02..ad06556 100644
--- a/Makefile
+++ b/Makefile
@@ -14,16 +14,17 @@ all: build
 always-make = $(filter -B,$(MAKEFLAGS))
 avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs")
 
-init: config content
+iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup)
+
+init: $(iki_configfiles) content
 
 shared/.git:
 	git submodule init
 	git submodule update --init --recursive
 
-config: setupfiles = $(wildcard $@/*.setup)
-config: shared/.git
-	$(if $(setupfiles),,mkdir -p '$@')
-	$(if $(setupfiles),,ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup')
+$(iki_configfiles): % : %.in shared/.git
+	$(if $(wildcard config),,mkdir config)
+	ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup $@
 
 content: notempty = $(wildcard $@/*.mdwn)
 content: shared/.git
-- 
cgit v1.2.3


From cf92a6b4a6ec9f8025fd3847ec4c2d7cd7c3ddac Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
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 ++++++++++++++----
 config/include.mk | 47 -----------------------------------------------
 2 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 config/include.mk

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
diff --git a/config/include.mk b/config/include.mk
deleted file mode 100644
index 60c0f68..0000000
--- a/config/include.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-domain = example.com
-website = www.$(domain)
-srcsite = source.$(domain)
-gitrepo = site/content
-
-plugins = goodstuff \
-
-plugins-off =
-
-admins = \
-
-IKIWIKI_CONFIG_OPTIONS = \
-	--wikiname 'SampleWiki' \
-	--adminemail 'webmaster@$(domain)' \
-	$(patsubst %,--adminuser '%',$(admins)) \
-	$(patsubst %,--plugin %,$(plugins)) \
-	$(patsubst %,--disable-plugin %,$(plugins-off)) \
-
-# paths
-#IKIWIKI_CONFIG_OPTIONS += --set-yaml add_underlays='- $(CURDIR)/styling'
-IKIWIKI_CONFIG_OPTIONS += \
-	--set wikistatedir='$(CURDIR)/.ikiwiki' \
-
-# collaboration/aggregation
-IKIWIKI_CONFIG_OPTIONS += \
-	--allowrss \
-	--allowatom \
-
-# styling
-IKIWIKI_CONFIG_OPTIONS += \
-	--set theme=goab \
-	
-# CGI
-IKIWIKI_CONFIG_OPTIONS += \
-	--url 'http://$(website)/' \
-	--cgiurl 'http://$(website)/ikiwiki.cgi' \
-	--set cgi_wrapper='$(CURDIR)/build/cgi/ikiwiki.cgi' \
-	--set cgi_wrappermode=00755 \
-
-# VCS
-IKIWIKI_CONFIG_OPTIONS += \
-	--rcs=git \
-	--historyurl 'http://$(srcsite)/?p=$(gitrepo).git;a=history;f=[[file]]' \
-	--diffurl 'http://$(srcsite)/?p=$(gitrepo).git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' \
-	--set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki' \
-	--set git_wrappermode=06755 \
-
-- 
cgit v1.2.3


From 4365e4862e1c68b35683fa47f9a5205c1a454f21 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 1 Mar 2012 01:58:35 +0100
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 2e11ffc..062f5dc 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 2e11ffc0504c48ccbd866eb7296795df75722092
+Subproject commit 062f5dc3070eb6dfe4dc6cdedc793e6658c66faa
-- 
cgit v1.2.3


From eb464ef3d9d51d63411cf798f67ef348f8c9acfc Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 1 Mar 2012 02:03:44 +0100
Subject: Git-ignore content, styling and generated setups.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index e4b7070..90e0c3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 */.sass-cache/
 /build/
+/content/
+/styling/
+/config/ikiwiki*.setup
-- 
cgit v1.2.3


From 73ade5952e04e09a07c380259695d512fa618d77 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 1 Mar 2012 02:12:38 +0100
Subject: Git-ignore .ikiwiki subdirs.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 90e0c3b..7c191a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /content/
 /styling/
 /config/ikiwiki*.setup
+/.ikiwiki*/
-- 
cgit v1.2.3


From eca8de1dffdcb1bddbfcb1e19b0e5caf98b05ee4 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 10 Mar 2012 05:41:54 +0100
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 062f5dc..c084b22 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 062f5dc3070eb6dfe4dc6cdedc793e6658c66faa
+Subproject commit c084b22bbbf6f439352bc8cd36dd190265abf4b6
-- 
cgit v1.2.3


From cc578ffaaba750971f64d347aac4e7029097c725 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 24 Mar 2012 00:59:04 +0100
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index c084b22..92b13c2 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit c084b22bbbf6f439352bc8cd36dd190265abf4b6
+Subproject commit 92b13c2820e9a29c0f111bf7316bf4cada3d9f97
-- 
cgit v1.2.3


From f73aef5f6293dbb3126dbe90237f146252b9cc38 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 24 Mar 2012 01:13:02 +0100
Subject: Sync with HEAD of submodule: shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 92b13c2..a8ff157 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 92b13c2820e9a29c0f111bf7316bf4cada3d9f97
+Subproject commit a8ff1572ee6c5aa099f8ef7b047fe02b09498c2f
-- 
cgit v1.2.3


From 4c3aa89f9bebbfeb98772980fc2a12acf459ed43 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 4 Aug 2012 15:57:13 +0200
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index a8ff157..3429e89 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit a8ff1572ee6c5aa099f8ef7b047fe02b09498c2f
+Subproject commit 3429e896b4f4be1a3c8cae129845b2a945756858
-- 
cgit v1.2.3


From e8353418082695033c1a641aa58afc02c98d60d9 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 4 Aug 2012 18:51:13 +0200
Subject: Sync with HEAD of submodule shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 3429e89..a3edb3d 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 3429e896b4f4be1a3c8cae129845b2a945756858
+Subproject commit a3edb3db1699c2fe280bd4e26a2806c2a7d6413e
-- 
cgit v1.2.3


From 6b4e8bb18cb91c94c9cd4ab078848da385b0a9e3 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 4 Aug 2012 19:51:05 +0200
Subject: Sync with HEAD of submodule shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index a3edb3d..22dc919 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit a3edb3db1699c2fe280bd4e26a2806c2a7d6413e
+Subproject commit 22dc919a2940bf620f211e50b0ad4f7590b4d6eb
-- 
cgit v1.2.3


From c2a7bcf4d17a325b22bae6400a847856fd89815c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 4 Aug 2012 22:30:55 +0200
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 22dc919..7f129e4 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 22dc919a2940bf620f211e50b0ad4f7590b4d6eb
+Subproject commit 7f129e4ac0c4e83e360b91c1e6990cc69a330994
-- 
cgit v1.2.3


From d470de258eb6b61890f647df20c96179c139efc6 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 9 Aug 2012 01:42:44 +0200
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 7f129e4..414c90a 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 7f129e4ac0c4e83e360b91c1e6990cc69a330994
+Subproject commit 414c90a4fe2a82e15e108d58bbf83f1242930ffa
-- 
cgit v1.2.3


From e2567996751ed40ec9d33a2dc24d8208877eaecc Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 9 Oct 2012 03:06:08 +0200
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 414c90a..f75f700 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 414c90a4fe2a82e15e108d58bbf83f1242930ffa
+Subproject commit f75f700722c6b497fba6f22ff9ee9f7899614067
-- 
cgit v1.2.3


From a5243e1dc8a2e9cd395c643fffc75fbe5b41d365 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 13 Oct 2013 01:37:15 +0200
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index f75f700..119d59b 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit f75f700722c6b497fba6f22ff9ee9f7899614067
+Subproject commit 119d59b0ee9adc6af49d734084c468320e1086e4
-- 
cgit v1.2.3


From 06fc8eaeb601226895108f17cc7a0015a1c5c76a Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 28 Oct 2013 01:17:27 +0100
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 119d59b..0a8db3d 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 119d59b0ee9adc6af49d734084c468320e1086e4
+Subproject commit 0a8db3d29e26b2e31b0d61488a7a59c439c08a8b
-- 
cgit v1.2.3


From 6a627741d23f971e8aeded2b2c3b179fb01e22ed Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 1 Dec 2013 20:21:19 +0100
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 0a8db3d..53773d2 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 0a8db3d29e26b2e31b0d61488a7a59c439c08a8b
+Subproject commit 53773d297cf2800819773051fde97d475613d81e
-- 
cgit v1.2.3


From 47cc5abb8a23c06366bb660f4b5b27fa13ea8117 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 2 Dec 2013 17:52:15 +0100
Subject: Explicitly refresh when not forcing rebuild: ikiwiki man page lie
 about default.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 39dcbf1..2f20b58 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,6 @@ content:
 
 build:
 	$(if $(cssprojects),$(MAKE) $(cssprojects))
-	$(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild);)
+	$(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);)
 
 .PHONY: all build configfiles
-- 
cgit v1.2.3


From 965a23936217570aa9ee3917e2721b7d4eed362a Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 2 Dec 2013 18:09:25 +0100
Subject: Fix detect forced build.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2f20b58..1f0366d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ all: build
 -include config/include.mk
 -include shared/themes/include.mk
 
-always-make = $(filter -B,$(MAKEFLAGS))
+always-make = $(findstring B,$(MAKEFLAGS))
 avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs")
 
 iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup)
-- 
cgit v1.2.3


From e0011c1880056b4b2a05f8e1e386629bfc699784 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 22 Jan 2015 18:05:39 +0100
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 53773d2..0dc5024 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 53773d297cf2800819773051fde97d475613d81e
+Subproject commit 0dc5024b0c18e330829e407f0f3a8330eafd6cb0
-- 
cgit v1.2.3


From ad23e13c246d2fab0af0cb43a76997b50454e03e Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 26 Feb 2015 17:47:19 +0100
Subject: Handle optional forms: Copy, set executable and expand build_path.

---
 .gitignore | 1 +
 Makefile   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7c191a6..5f6f3a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 /build/
 /content/
 /styling/
+/forms/
 /config/ikiwiki*.setup
 /.ikiwiki*/
diff --git a/Makefile b/Makefile
index 1f0366d..acf4f4f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,5 +49,8 @@ content:
 build:
 	$(if $(cssprojects),$(MAKE) $(cssprojects))
 	$(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);)
+	$(if $(wildcard forms),cd forms && find * -name '*.cgi' \
+	-exec install -DT '{}' ../build/forms/'{}' ';' \
+	-exec perl -i -pe "s:'../build':'$(CURDIR)':g" ../build/forms/'{}' ';')
 
 .PHONY: all build configfiles
-- 
cgit v1.2.3


From f111e49b9f4e862501b283b7c1b3d8a24c0ab4eb Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 26 Feb 2015 18:21:58 +0100
Subject: Fix build_path expansion.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index acf4f4f..b835f64 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,6 @@ build:
 	$(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);)
 	$(if $(wildcard forms),cd forms && find * -name '*.cgi' \
 	-exec install -DT '{}' ../build/forms/'{}' ';' \
-	-exec perl -i -pe "s:'../build':'$(CURDIR)':g" ../build/forms/'{}' ';')
+	-exec perl -i -pe "s:'../build':'$(CURDIR)/build':g" ../build/forms/'{}' ';')
 
 .PHONY: all build configfiles
-- 
cgit v1.2.3


From 6fd62b76bfdfb9771c2ec270e4619191f0a54a7e Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:07:41 +0100
Subject: Add IKIWIKI_UNDERLAYS for multiple underlays.

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

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 13ab8b224964abcf8dd8724462f8dbb1664d58a5 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:22:21 +0100
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 0dc5024..15cba4b 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 0dc5024b0c18e330829e407f0f3a8330eafd6cb0
+Subproject commit 15cba4b6b8888557b868db8008f8137e6f65093a
-- 
cgit v1.2.3


From d8ebe286c96f329a5894340c4f5643ca55e1094d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:26:17 +0100
Subject: Fix generate ikiwiki setup only once.

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

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 <dr@jones.dk>
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(-)

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


From 55eac3f45fb29e6b40fc5f6d3346add62f12ac49 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 14 Mar 2015 16:46:57 +0100
Subject: Update git URL.

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 75c24b1..4417863 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Ikiwiki build environment
 
 To quickly start working with content, this should suffice:
 
-	git clone git://source.jones.dk/ikiwiki/site
+	git clone git://source.jones.dk/ikiwiki
 	cd site
 	make init
 	make
-- 
cgit v1.2.3


From 8718431b6266fe18fabf6c290a397b1e23b45562 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 19 Jan 2017 11:36:44 +0100
Subject: Add initial config seed file.

---
 config/ikiwiki.setup.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 config/ikiwiki.setup.in

diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in
new file mode 100644
index 0000000..ed57570
--- /dev/null
+++ b/config/ikiwiki.setup.in
@@ -0,0 +1,12 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# Seed info for creating ikiwiki setup file.
+#
+# Passing this to ikiwiki --setup ... --dumpsetup will make ikiwiki
+# generate its setup file.
+#
+# Remember to remove ikiwiki.setup and re-run make init any time you
+# edit this file.
+#
+# name of the wiki
+wikiname: Example website
-- 
cgit v1.2.3


From f0c0e05f1ed6e0473698f4a277b9b0e64b5253f4 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 13 Mar 2017 15:46:37 +0100
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index 15cba4b..f9eebd9 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 15cba4b6b8888557b868db8008f8137e6f65093a
+Subproject commit f9eebd954696aa86fe4acd810d85757947d21a6a
-- 
cgit v1.2.3


From bc58048bf51afd8b620765ba62869f2a041af4fe Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 20 Mar 2017 20:57:35 +0100
Subject: Sync with HEAD of shared.

---
 shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared b/shared
index f9eebd9..f1803ec 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit f9eebd954696aa86fe4acd810d85757947d21a6a
+Subproject commit f1803ec4389989609571ab78387c9252bbc9078f
-- 
cgit v1.2.3