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

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

diff --git a/shared b/shared
index e1cbaae..b295a25 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit e1cbaae38ae03de58e5359432a56a579940cfb2e
+Subproject commit b295a25f556901bdf5235649ff12e5c96a6aa8bf
-- 
cgit v1.2.3


From 92b6946d6a836969753f0f6b2ba898dc4de2f1c8 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 9c341524045e44136f9553441a975c9f487a645a 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 758b45a8370f11736b8691bf4e48de52d7cdaf5d 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 79cb9f347d7cd12e46302fcd5cfd3ebdf8d8deb2 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 5d84ebe95e4e010e27292716aa45d3fc18200998 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 22 Jan 2015 18:05:15 +0100
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 0a8db3d..8418a77 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 0a8db3d29e26b2e31b0d61488a7a59c439c08a8b
+Subproject commit 8418a770a2be476ecd961d3279d00e151a0a5318
-- 
cgit v1.2.3


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

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

diff --git a/shared b/shared
index b295a25..6f90b38 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit b295a25f556901bdf5235649ff12e5c96a6aa8bf
+Subproject commit 6f90b387298830d42e5b7b0c93dfc5cf605a1a14
-- 
cgit v1.2.3


From 76c696940a1643fd23da2b05e1b78480563bbac2 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 f22e9ed51f5c3701383a7851abceee22dcd3da27 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 2e5484db72737e303c45f51eebfbd739456de4ac 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 c2a69adfd867989e6801973141709781500198e2 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 e4d5b92329ed723c925c2c6c3bc76a32b691bd58 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 0ba0c068dccb5b26041df265e1fad36dbe723551 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 ca9c5a381587f8c291860cb7ea03eee5a79df3cd Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:22:02 +0100
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 6f90b38..ee913a2 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 6f90b387298830d42e5b7b0c93dfc5cf605a1a14
+Subproject commit ee913a2cf511574090f1faffe2e27fe0c28e09d4
-- 
cgit v1.2.3


From 687bba4325adc4dc860d002fc4e626355d081f79 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:22:44 +0100
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 8418a77..03685c6 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 8418a770a2be476ecd961d3279d00e151a0a5318
+Subproject commit 03685c64a7597ac1d33540c1efcbc68e36573fde
-- 
cgit v1.2.3


From 5306cf25be0a868fe467729a1ed6abb9d8e12e44 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 adbe8c1de392302287d1c6116e6f578e44ee9128 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 699f2014f558490a97e2ce91bfd6a371c322cea6 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 ff74770e76652a7cfb5ac1e61712b36a8dfda917 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 810f2d264898ec59c42a7ec9cf46a777240425e8 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 4cd258afd75e0f87a402c26805581ba13ca56bbe 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 fac5bcbdaa9238cbd28275d57eb418b5e07cfb17 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 8678cdc4d0478cc4ea86bbb4737f2a8393d8c2ae 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 7bbd6ae13149a0b6bbcbb52033f12d806a553c9d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 13 Mar 2017 15:47:27 +0100
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 03685c6..ce086c5 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 03685c64a7597ac1d33540c1efcbc68e36573fde
+Subproject commit ce086c50aed1498aa959ba96dc75f35a753cba90
-- 
cgit v1.2.3


From 63305332b7d452b76f9cbca07931976435a93233 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 27 Mar 2017 03:15:20 +0200
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 9d18ecc..1a02048 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 9d18ecccdf571faa067fd8d28a9209bd931d409c
+Subproject commit 1a020481656091d1ad13c48d5aa381e6b93d8bce
-- 
cgit v1.2.3


From bd0bf245d3fa68b1246205e54a9b6515b3f3e0d1 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 27 Mar 2017 03:15:54 +0200
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index ce086c5..b9bbfdc 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit ce086c50aed1498aa959ba96dc75f35a753cba90
+Subproject commit b9bbfdc13e8ca77b3b8b6b7f82fadea26e0be9d1
-- 
cgit v1.2.3


From f374280d52cc5df1bc6b85f7b8aa33d7925b8c09 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 27 Mar 2017 03:16:40 +0200
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index ee913a2..ad9c6e6 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit ee913a2cf511574090f1faffe2e27fe0c28e09d4
+Subproject commit ad9c6e629872b6fcbf0f340545588cd9b3358542
-- 
cgit v1.2.3


From cfc8a209942966c44f36fb6218b95922ba3c2311 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 27 Mar 2017 03:16:59 +0200
Subject: Sync with HEAD of shared.

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

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


From 8f6e11670c485cc3316ead626c0a126f86df5e0c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 18 Apr 2017 20:55:50 +0200
Subject: Fix fail if ikiwiki fails.

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

diff --git a/Makefile b/Makefile
index 4217275..b554734 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,7 @@ content:
 
 build:
 	$(if $(cssprojects),$(MAKE) $(cssprojects))
+	set -e;\
 	$(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/'{}' ';' \
-- 
cgit v1.2.3


From df80b903ce93295c030f2a185d68686216cbdb3b Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 18 Apr 2017 20:56:40 +0200
Subject: Improve forms handling.

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

diff --git a/Makefile b/Makefile
index b554734..1611825 100644
--- a/Makefile
+++ b/Makefile
@@ -56,8 +56,14 @@ build:
 	$(if $(cssprojects),$(MAKE) $(cssprojects))
 	set -e;\
 	$(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)/build':g" ../build/forms/'{}' ';')
+	set -e;\
+	$(foreach path,$(patsubst forms/%,%,$(wildcard forms/*.cgi forms/*/*.cgi)),\
+	install -DT 'forms/$(path)' 'build/forms/$(path)'; \
+	perl -i -pe "s:'../build/:'$(CURDIR)/build/:g" 'build/forms/$(path)';\
+	$(foreach htmlstempath,$(path:%.cgi=build/html/%),\
+	cp -f $(htmlstempath).html $(htmlstempath).tmpl;\
+	FORMBUILDER_NOHEADER=1 'build/forms/$(path)' > $(htmlstempath).html~;\
+	mv -f $(htmlstempath).html~ $(htmlstempath).html;\
+	rm $(htmlstempath).tmpl))
 
 .PHONY: all build configfiles
-- 
cgit v1.2.3