summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-09 05:17:00 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-09 05:17:00 +0200
commit044a45920bf1e5c509bd924e2e35ee7e1b9f23f8 (patch)
treecf0723f70f994a3533088e1792bbef4d389e79cf /Makefile
parentcf73eeb407dc71c8747913eed9dbf77b80fe07ab (diff)
parente651d76ecad4d55295a1b4805a6113dbae8cda4d (diff)
Merge branch 'master' into scs
Conflicts (manually resolved): Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f263303..2dc0826 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,10 @@ SOURCES = ikiwiki
ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
ikiwiki_MODULES = templates basewiki smiley
+ikiwiki_basewiki_FLAVORS = nonedit
+ikiwiki_templates_FLAVORS = nonedit
ikiwiki_POMODULES = basewiki smiley
-ikiwiki_BRANCH = scs-LOCALE
+ikiwiki_BRANCH = scs-FLAVOR-LOCALE
ikiwiki_LOCALES = da nb
ikiwiki_POLOCALES = da
@@ -17,6 +19,8 @@ ikiwiki_POLOCALES = da
# FIXME: Not all of these are used within templates
masterdir = $(module)
l10ndir = $(module)_l10n/$(locale)
+flavordir = $(module)_$(flavor)
+flavorl10ndir = $(module)_$(flavor)_l10n/$(locale)
podir = po
all: $(SOURCES)