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:01:36 +0100
commit7887ffba2d9414aa1aa4e9051b0e4987673a9af4 (patch)
tree0b929fe8cd9293363966d57c07c93f339aa82c0f
parent2e11ffc0504c48ccbd866eb7296795df75722092 (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' \