diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:17:10 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:17:10 +0200 |
commit | 582c2073b2ab105a0f932ddda6924aff2d913e60 (patch) | |
tree | b028d580bbc99d595d18810499a93e701cb31e1d /Makefile | |
parent | 07bfb10a4979f79bef7d57def3e8212fedc378d4 (diff) | |
parent | e651d76ecad4d55295a1b4805a6113dbae8cda4d (diff) |
Merge branch 'master' into wian
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 = master-LOCALE +ikiwiki_BRANCH = master-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) |