summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-15 00:26:35 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-15 00:26:35 +0200
commita6f7e2146ef02f218f9180babd3fb3741c58e810 (patch)
tree90cc66d8643c53c749ae04adcefb45933f093cd3 /Makefile
parentb440876a339be7e980220b9362c0fa1173257029 (diff)
parent7d0d5f88ee5f12f0ae7ed872d783809fe34f22c0 (diff)
Merge branch 'nonedit' into allinone-nb
Conflicts (manually resolved): ikiwiki_nb.setup Also, use nb setup files in Makefile.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4f3fe1e..8bf12d5 100644
--- a/Makefile
+++ b/Makefile
@@ -7,18 +7,18 @@ ikiwiki_BRANCH = master-FLAVOR-LOCALE
# modules (subproject extension names) used. Expands Git ORIGINs
ikiwiki_MODULES = templates basewiki smiley
# flavors used. Expands Git BRANCHes
-#ikiwiki_basewiki_FLAVORS = nonedit
-#ikiwiki_templates_FLAVORS = nonedit
+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_POLOCALES = da
-#dummy_MODULES = content_dummy
+dummy_MODULES = content_dummy
# uncomment this when ikiwiki.setup is configured for the local environment
-#CONFIGS = ikiwiki.setup
+#CONFIGS = ikiwiki_nb.setup ikiwiki_nb_admin.setup
# Everything after this is generic