summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 14:51:12 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 14:51:12 +0200
commit3266b8164ded4951abc4ec8b444417b3f7dda7f3 (patch)
treefffce0e3b7e05a12589291ef593bc8bf56d7c9fd /Makefile
parent5632494fe651111306b2decd0fe6e2278e3d0212 (diff)
parentba197084b657f202d1e81424b8fdf71e191f6749 (diff)
Merge branch 'master' into allinone
Conflicts (manually resolved): ikiwiki.setup
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b2f78bd..da1b14e 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 = allinone-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