summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-04 19:50:34 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-04 19:50:34 +0200
commit22dc919a2940bf620f211e50b0ad4f7590b4d6eb (patch)
tree2fa9da7dd63d3cfef5238dc59372f5d2c792bd14
parenta3edb3db1699c2fe280bd4e26a2806c2a7d6413e (diff)
parentccc9976fb7916bce057165c5cbab7c38a8e91945 (diff)
Merge branch 'master' into master-da
Conflicts: basewiki include.mk openid-selector osm templates
-rw-r--r--include.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/include.mk b/include.mk
index e0583e8..bff485a 100644
--- a/include.mk
+++ b/include.mk
@@ -8,10 +8,9 @@ IKIWIKI_SHARED_DEFAULTS ?= \
--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-yaml add_underlays='- $(CURDIR)/styling' \
+