summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 14:22:27 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 14:22:27 +0200
commit53991a00b7a53c10646c5757835cbf66bbcc93da (patch)
tree17648432addcb085ef1e1f6a62b7655cde7b339f
parent3cfc45e2c94843a39ccd9ed4e667d30bae4cd41d (diff)
parente595e37450ff6c0971924f3e7b461febe4fd1ebb (diff)
Merge branch 'master' into clean
Conflicts (manually resolved): Makefile
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index fa30bb3..9082822 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 = clean-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 = clean-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