summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-03-01 01:01:36 +0100
committerJonas Smedegaard <dr@jones.dk>2012-03-01 01:03:08 +0100
commit4c0e3f5ea9e98d3400383fcc47b3bb2b47bd5d08 (patch)
treea72d5257b290784af99942a0735e1f7e5b6ce957
parent395a181654f479fd6bfef70b7f4d9031e5d726d1 (diff)
Separate defaults from options (the latter applied last, overriding custom settings), and extend with more defaults and options.
-rw-r--r--include.mk21
1 files changed, 16 insertions, 5 deletions
diff --git a/include.mk b/include.mk
index 1a0e04a..e0583e8 100644
--- a/include.mk
+++ b/include.mk
@@ -1,6 +1,17 @@
+IKIWIKI_SHARED_DEFAULTS ?= \
+ --plugin goodstuff \
+ --plugin underlay \
+ --plugin theme \
+ --set theme=goab \
+ --plugin h1title \
+ --plugin favicon \
+ --plugin typography \
+ --set typographyattributes=ie \
+ --set exclude='^.*\.(rb|scss)$$' \
+
IKIWIKI_SHARED_OPTIONS ?= \
- --templatedir '$(CURDIR)/shared/templates' \
- --set underlaydirbase='$(CURDIR)/shared' \
- --underlaydir '$(CURDIR)/shared/basewiki' \
- --libdir '$(CURDIR)/shared/perl' \
- --set exclude='^.*\.(rb|scss)$$'
+ --templatedir '$(CURDIR)/shared/templates' \
+ --set underlaydirbase='$(CURDIR)/shared' \
+ --underlaydir '$(CURDIR)/shared/basewiki' \
+ --libdir '$(CURDIR)/shared/perl' \
+ --set-yaml add_underlays='- $(CURDIR)/styling' \