summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 19:45:39 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 19:45:39 +0200
commit61ccb5d0b29875f61cac2ea39474d16a0437692c (patch)
tree1a6764e2b49a788ef6683935883ed6ddf8574c3b /Makefile
parent258ef913fa6cfa38c7d9fe137a296bd03d62da09 (diff)
parentfa843e5a6436ec8c53f89255205515610107519c (diff)
Merge branch '_clean' into clean
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 ba1228e..d9fb135 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 = clean-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)),)