diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-04-18 22:00:03 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-18 22:00:03 +0200 |
| commit | 0d052a347fd51381e851618c1702acafeff84a41 (patch) | |
| tree | b41e22926fc762d9b3bab658dc482821c07c7bc7 | |
| parent | 799ea94311e41583a9fb4f129150fc69dbd3f0fa (diff) | |
| parent | 13012d44a3df7e88f216ef018a36dd55b954d9e4 (diff) | |
Merge remote-tracking branch 'iki/plaintitle-da'
| -rw-r--r-- | Makefile | 13 | ||||
| m--------- | shared | 0 |
2 files changed, 10 insertions, 3 deletions
@@ -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 e3613a39a0830dca05749471982a7ee8fe72c9d |