summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 14:24:38 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 14:24:38 +0200
commit207ac2343b5dd658f3d380dd92d1260fb2135b43 (patch)
treedb36e1159897da3b8ae26a21b9599a7f9d5e55ee /Makefile
parent84548401b3eb8275ed764926c593c148cf50043c (diff)
parente595e37450ff6c0971924f3e7b461febe4fd1ebb (diff)
Merge branch 'master' into nonedit
Conflicts (manually resolved): Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1eddc6c..0bbec9c 100644
--- a/Makefile
+++ b/Makefile
@@ -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