diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 16:14:05 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 16:14:05 +0200 |
| commit | 9e65c28f5d042127f98609e9ee76e9c1cbb1fbc3 (patch) | |
| tree | 00cec3d9d9a6d8a7fbb35ac69afbe53a15cf5b7a /Makefile | |
| parent | 73d224399dc997e857bdd1fa3955e33a9c9d3d07 (diff) | |
| parent | e595e37450ff6c0971924f3e7b461febe4fd1ebb (diff) | |
Merge branch 'master' into allinone
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 10 insertions, 4 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 = allinone-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 = allinone-FLAVOR-LOCALE -ikiwiki_LOCALES = da nb -ikiwiki_POLOCALES = da +# locales used. Expands Git BRANCHes +#ikiwiki_LOCALES = da nb +# gettext-based modules and locales used +#ikiwiki_POMODULES = basewiki smiley +#ikiwiki_POLOCALES = da #dummy_MODULES = content_dummy |