diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:19:04 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-09 05:19:04 +0200 |
| commit | 73d224399dc997e857bdd1fa3955e33a9c9d3d07 (patch) | |
| tree | 41653c1ffd4e4e3b86eeb165bc972b8d01263163 /Makefile | |
| parent | 354a21164830b6c2db1a2c68103cc18bf80863c6 (diff) | |
| parent | 582c2073b2ab105a0f932ddda6924aff2d913e60 (diff) | |
Merge branch 'wian' into allinone
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_LOCALES = da no_NB +ikiwiki_BRANCH = allinone-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) |