summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 16:29:51 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 16:29:51 +0200
commit23ad0936a856dfb67523924e8f036f3289acd218 (patch)
treeb90596ca4ad6697391485ef4266d3c42ad582c6c /Makefile
parentc1ba94c8fdc2ab226de51ae658f330aad853d998 (diff)
parent0b7b6529b9f12bfae697aff92fce88b514a9354e (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved): .gitignore ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e33973e..5dfd85e 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 content_dummy_da content_dummy_nb