summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-04 19:44:45 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-04 19:44:45 +0200
commitcc4bcbadbbabb468dd0f78149bc2f227393dd57c (patch)
treee9b151afff53d4799a10f34b2883fb68f2ebc8c8
parentacced10a9ec5c3fb7d09d0dcc719c87af9be27b6 (diff)
Drop IKIWIKI_SHARED_OPTIONS (merge into IKIWIKI_SHARED_DEFAULTS.
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1fb0d33..39dcbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,14 @@ IKIWIKI_DEFAULTS ?= \
--rcs git \
--set cgi_wrappermode=00755 \
--set git_wrappermode=06755 \
+ --set srcdir='@CURDIR@/content' \
+ --set destdir='@CURDIR@/build/html$(iki_flavor:%=-%)' \
+ --set cgi_wrapper='@CURDIR@/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \
+ --set git_wrapper='@CURDIR@/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \
+ --set wikistatedir='@CURDIR@/.ikiwiki$(iki_flavor:%=-%)' \
$(IKIWIKI_SHARED_DEFAULTS)
-IKIWIKI_OPTIONS ?= \
- --set srcdir='$(CURDIR)/content' \
- --set destdir='$(CURDIR)/build/html$(iki_flavor:%=-%)' \
- --set cgi_wrapper='$(CURDIR)/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \
- --set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \
- --set wikistatedir='$(CURDIR)/.ikiwiki$(iki_flavor:%=-%)' \
- $(IKIWIKI_SHARED_OPTIONS)
+export CURDIR
cssprojects ?= $(wildcard shared/themes/goab styling)
@@ -39,7 +38,8 @@ 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 $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@
+ ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@
+ perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@
content: notempty = $(wildcard $@/*.mdwn)
content: