diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:42:42 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:42:42 +0200 |
| commit | 006132cddfeef67783bc4224332dbfefc658dc08 (patch) | |
| tree | 571997ca985cf0840c9087a59ae222cc8c68ea6e /Makefile | |
| parent | 066de1a6b7c799cc4d2accc0d640daedb751f76f (diff) | |
| parent | 231ffc619a287ec49921e99488bd9fbc733a3c3a (diff) | |
Merge branch 'master' into allinone
Conflicts:
Makefile (resolved manually)
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 = allinone-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)),) |