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

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

diff --git a/shared b/shared
index 468ffa7..ccc9976 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 468ffa7e6396295047319a1a93ef2c0fd37bf5ce
+Subproject commit ccc9976fb7916bce057165c5cbab7c38a8e91945
-- 
cgit v1.2.3


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

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

diff --git a/shared b/shared
index ccc9976..05a2b14 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit ccc9976fb7916bce057165c5cbab7c38a8e91945
+Subproject commit 05a2b14c35b867db164068939e2f0590168f084c
-- 
cgit v1.2.3


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

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

diff --git a/shared b/shared
index 05a2b14..b6c420f 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 05a2b14c35b867db164068939e2f0590168f084c
+Subproject commit b6c420f5a817b16a4f7e9f375b44add1554c8ee4
-- 
cgit v1.2.3


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

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

diff --git a/shared b/shared
index b6c420f..2209aa4 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit b6c420f5a817b16a4f7e9f375b44add1554c8ee4
+Subproject commit 2209aa4cdc29918897a13023ec1fa88e6090e538
-- 
cgit v1.2.3


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

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

diff --git a/shared b/shared
index 2209aa4..cc9f1db 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 2209aa4cdc29918897a13023ec1fa88e6090e538
+Subproject commit cc9f1dbde7ec26fd7298525c772781f75498c5b5
-- 
cgit v1.2.3


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

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

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


From 1a3640ad0af45f0dea69e3c4a8fc20674b82ee83 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 ee39e72561552e4a94635aba20c5a0e4abd9aae2 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 d54c69f1c554e4b1434f208b33fcde9c553e3c63 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 22 Jan 2015 18:04:50 +0100
Subject: Sync with HEAD of shared.

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

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


From 3c57fd5713d08ef2b4b29ff15775f57421bf8498 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 846039b65b33e6813cc73486ad84431039f3a860 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 002f117bc41acb578244b907e9be6dc8975f63c3 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 72e4939e5be07f066ba25d843f13e6a0b9b0efb5 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 27 Feb 2015 18:22:34 +0100
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 2276615..695c915 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 22766156d5c58eecb49f83cbf1fbb1730d1e8888
+Subproject commit 695c915dfd9dcdc74ff0451b20c94c419f73e76a
-- 
cgit v1.2.3


From eb62b9a05f2ec7570427f9296ef965d59ab4d795 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 d03f86accda76e43f84ba10b80489526d3287474 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 18a7b949a7d8b20a62e50c49af3658d4e30fd917 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 7036b2be2f0be6bcf60dbff689a6abc83e0efa04 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 96c2cde6dd214d712ac3acb6fd1841a0135f018d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 20 Mar 2017 21:02:09 +0100
Subject: Sync with HEAD of shared.

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

diff --git a/shared b/shared
index 695c915..9d18ecc 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 695c915dfd9dcdc74ff0451b20c94c419f73e76a
+Subproject commit 9d18ecccdf571faa067fd8d28a9209bd931d409c
-- 
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 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


From 6f66dffb61e24dd91bfb20e0c981c6074b2befe4 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 25 Mar 2021 02:27:26 +0100
Subject: sync submodule shared

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

diff --git a/shared b/shared
index 1a02048..369e1af 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 1a020481656091d1ad13c48d5aa381e6b93d8bce
+Subproject commit 369e1af1b598d0226556d3c9c380ed67a357a9e7
-- 
cgit v1.2.3


From 81fa34478eb49f4dfd312c6533329cfcb65dd0ca Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 25 Mar 2021 02:31:44 +0100
Subject: sync submodule shared

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

diff --git a/shared b/shared
index 369e1af..9d19a7a 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 369e1af1b598d0226556d3c9c380ed67a357a9e7
+Subproject commit 9d19a7ad618498764373ea9b601afa77314fe6cd
-- 
cgit v1.2.3


From fd6d285a4e577b6d5b41a8c6c0af925296d9eda2 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 28 Mar 2021 19:28:37 +0200
Subject: sync submodule shared

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

diff --git a/shared b/shared
index 9d19a7a..d3745ef 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 9d19a7ad618498764373ea9b601afa77314fe6cd
+Subproject commit d3745efd8d7c654e28033465086f375253032b25
-- 
cgit v1.2.3


From fabbce549bd3233d392869786d02771ca948f7b1 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 28 Mar 2021 19:34:43 +0200
Subject: fix define sass_includes

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

diff --git a/Makefile b/Makefile
index 1611825..4f99a5e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@ export CURDIR
 
 cssprojects ?= $(wildcard shared/themes/goab styling)
 
+sass_includes ?= shared/themes/default /usr/share/sass /usr/share/sass/stylesheets /usr/share/compass/frameworks/normalize-scss/stylesheets
+
 all: build
 
 -include shared/include.mk
-- 
cgit v1.2.3


From 0ebe1db1758437b0a1ebd3d8393cc52821db60ff Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 29 Mar 2021 14:24:16 +0200
Subject: fix build forms

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

diff --git a/Makefile b/Makefile
index 4f99a5e..0046921 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,8 @@ build:
 	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/%),\
+	perl -i -pe "s:'../build:'$(CURDIR)/build:g" 'build/forms/$(path)';\
+	$(foreach htmlstempath,$(path:%.cgi=build/html/%/index),\
 	cp -f $(htmlstempath).html $(htmlstempath).tmpl;\
 	FORMBUILDER_NOHEADER=1 'build/forms/$(path)' > $(htmlstempath).html~;\
 	mv -f $(htmlstempath).html~ $(htmlstempath).html;\
-- 
cgit v1.2.3


From 54989cc1649701a57d7ca5ad99fe32acdb0e7c3f Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 29 Mar 2021 14:34:59 +0200
Subject: isolate iki projects and forms as distinct build targets

---
 Makefile | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 0046921..17cc5ec 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,8 @@ 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)
+iki_projects = $(patsubst config/%.setup,build-iki/%,$(iki_configfiles))
+form_projects := $(patsubst forms/%.cgi,build-form/%,$(wildcard forms/*.cgi forms/*/*.cgi))
 
 init: shared/.git content
 	$(MAKE) $(iki_configfiles)
@@ -54,18 +56,15 @@ content:
 	$(if $(notempty),,mkdir -p '$@')
 	$(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn')
 
-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);)
-	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/%/index),\
-	cp -f $(htmlstempath).html $(htmlstempath).tmpl;\
-	FORMBUILDER_NOHEADER=1 'build/forms/$(path)' > $(htmlstempath).html~;\
-	mv -f $(htmlstempath).html~ $(htmlstempath).html;\
-	rm $(htmlstempath).tmpl))
+build: $(iki_projects) $(form_projects)
+$(iki_projects): build-iki/%: config/%.setup $(cssprojects)
+	ikiwiki --setup $<$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh)
+$(form_projects): build-form/%: forms/%.cgi build-iki/ikiwiki
+	install -DT $< build/$<
+	perl -i -pe "s:'../build:'$(CURDIR)/build:g" build/$<
+	cp -f build/html/$*/index.html build/html/$*/index.tmpl
+	FORMBUILDER_NOHEADER=1 build/$< > build/html/$*/index.html~
+	mv -f build/html/$*/index.html~ build/html/$*/index.html
+	rm build/html/$*/index.tmpl
 
-.PHONY: all build configfiles
+.PHONY: all build build-iki/% build-form/% configfiles
-- 
cgit v1.2.3