diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 14:23:31 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 14:23:31 +0200 |
commit | 2e07dd9c0356e419eaec48f84fcd6172b9418b85 (patch) | |
tree | e95151b2b6e2c408e8d7ae9597feec406cd820fb | |
parent | fdd996eacae0f95c99c27ebba6ca817cc7a975d3 (diff) | |
parent | e595e37450ff6c0971924f3e7b461febe4fd1ebb (diff) |
Merge branch 'master' into wian
-rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,13 +1,19 @@ SOURCES = ikiwiki +# Git origin (with capital MOULE replaced or stripped as needed) ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE +# Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed) +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_POMODULES = basewiki smiley -ikiwiki_BRANCH = master-FLAVOR-LOCALE +# locales used. Expands Git BRANCHes #ikiwiki_LOCALES = da nb -ikiwiki_POLOCALES = da +# gettext-based modules and locales used +#ikiwiki_POMODULES = basewiki smiley +#ikiwiki_POLOCALES = da #dummy_MODULES = content_dummy |