diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | config/ikiwiki.setup.in | 6 | ||||
| m--------- | shared | 0 |
3 files changed, 19 insertions, 9 deletions
@@ -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 @@ -23,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) @@ -52,11 +56,15 @@ content: $(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, --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/'{}' ';') +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 diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in index 70e5bcf..6e386ab 100644 --- a/config/ikiwiki.setup.in +++ b/config/ikiwiki.setup.in @@ -25,8 +25,10 @@ html5: 1 timeformat: '%A d. %e. %B' locale: da_DK.UTF-8 timezone: Europe/Copenhagen -historyurl: 'https://source.couchdesign.dk/genskabet/content.git/log/[[file]]' -diffurl: https://source.couchdesign.dk/genskabet/content.git/diff/[[file]]?id=[[sha1_sum]]' +#historyurl: 'https://source.couchdesign.dk/genskabet/content.git/log/[[file]]' +historyurl: '' +#diffurl: https://source.couchdesign.dk/genskabet/content.git/diff/[[file]]?id=[[sha1_sum]]' +diffurl: '' allowrss: 1 allowatom: 1 multimarkdown: 1 diff --git a/shared b/shared -Subproject 15cba4b6b8888557b868db8008f8137e6f65093 +Subproject d3745efd8d7c654e28033465086f375253032b2 |