summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 16:14:05 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 16:14:05 +0200
commit9e65c28f5d042127f98609e9ee76e9c1cbb1fbc3 (patch)
tree00cec3d9d9a6d8a7fbb35ac69afbe53a15cf5b7a /Makefile
parent73d224399dc997e857bdd1fa3955e33a9c9d3d07 (diff)
parente595e37450ff6c0971924f3e7b461febe4fd1ebb (diff)
Merge branch 'master' into allinone
Conflicts (manually resolved): Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 84073d3..6c658fa 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 = 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