From 4c0e3f5ea9e98d3400383fcc47b3bb2b47bd5d08 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 1 Mar 2012 01:01:36 +0100
Subject: Separate defaults from options (the latter applied last, overriding
 custom settings), and extend with more defaults and options.

---
 include.mk | 21 ++++++++++++++++-----
 1 file 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' \
-- 
cgit v1.2.3