diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:16:34 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:16:34 +0200 |
| commit | cf9d7b60d46c218c2fedc825922b5b1081a40ca3 (patch) | |
| tree | 4d1df1cc98620592c81ba66211878ed68a941930 /Makefile | |
| parent | a53189cdff1dcb63ba54fe9daec2242963d68ac9 (diff) | |
| parent | e651d76ecad4d55295a1b4805a6113dbae8cda4d (diff) | |
Merge branch 'master' into clean
Conflicts (manually resolved):
Makefile
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 = clean-LOCALE +ikiwiki_BRANCH = clean-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) |