summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 19:48:03 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 19:48:03 +0200
commit97c2f00d8748f7cb2c0a3b82694ca6cab6531897 (patch)
tree6b0a59544b02d6ba6cd50053c45577e4acdf2c0b /Makefile
parent352aa426bf442df996be8e8763a6622f762b411a (diff)
parentc105645368dd025efc83b0dd9e68b7a64bf1f005 (diff)
Merge branch '_multilang' into multilang
Conflicts: Makefile (manually resolved)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 8 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index fbcb99b..d2ba212 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,9 @@
SOURCES = ikiwiki
ikiwiki_VERSION = 2.62.1
-# 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
+# modules (subproject extension names) used. Expands SOURCES
ikiwiki_MODULES = templates basewiki smiley directives
-# flavors used. Expands Git BRANCHes
-#ikiwiki_basewiki_FLAVORS = nonedit
-#ikiwiki_templates_FLAVORS = nonedit
-# locales used. Expands Git BRANCHes
+# locales used. Expands SOURCES
ikiwiki_LOCALES = da nb
# gettext-based modules and locales used
#ikiwiki_POMODULES = basewiki smiley directives
@@ -30,7 +23,12 @@ flavordir = $(module)_$(flavor)
flavorl10ndir = $(module)_$(flavor)_l10n/$(locale)
podir = po
-all: $(SOURCES)
+all: init $(SOURCES)
+
+init:
+ git submodule init
+ git submodule update
+ touch init
install::
ifeq ($(strip $(CONFIGS)),)