Merge remote-tracking branch 'jones/couchdesign/bullseye-da'

2 files changed, 10 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 4217275..1611825 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,16 @@ 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/'{}' ';' \
-	-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
diff --git a/shared b/shared
-Subproject f9eebd954696aa86fe4acd810d85757947d21a6
+Subproject 9d19a7ad618498764373ea9b601afa77314fe6c