summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 15:35:56 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 15:35:56 +0200
commitebc6e1072b80603cbf65cc5f9902ad306742f858 (patch)
tree22f19d746b5bbf0dade789c9e238a654ec9ba7d7 /Makefile
parent6428160b3c7aefed77a442fc94dcf2f2eb2ffc4b (diff)
parent7bd063bd9ccc65ccacbcd1900fcd183c7c129b3d (diff)
Merge branch '_scs' into scs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a527449..99ce890 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,14 @@ ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
# Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed)
ikiwiki_BRANCH = scs-FLAVOR-LOCALE
# modules (subproject extension names) used. Expands Git ORIGINs
-ikiwiki_MODULES = templates basewiki smiley
+ikiwiki_MODULES = templates basewiki smiley directives
# flavors used. Expands Git BRANCHes
#ikiwiki_basewiki_FLAVORS = nonedit
#ikiwiki_templates_FLAVORS = nonedit
# locales used. Expands Git BRANCHes
#ikiwiki_LOCALES = da nb
# gettext-based modules and locales used
-#ikiwiki_POMODULES = basewiki smiley
+#ikiwiki_POMODULES = basewiki smiley directives
#ikiwiki_POLOCALES = da
#dummy_MODULES = content_dummy