diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:46:25 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:46:25 +0200 |
| commit | 0a184c16c927ad613935c28322d7eb33b18aedc9 (patch) | |
| tree | 8c5091c9872174f29b123e788fdbf50f62bf2d97 /Makefile | |
| parent | a4d3a0fc6319df9acf57b8df12f5f0054fd3b074 (diff) | |
| parent | 1c38e0cb52a622d7ebd6ef2f45d95efcb37e878c (diff) | |
Merge branch '_scs' into scs
Conflicts:
Makefile (manually resolved)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -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 = scs-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)),) |