diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-05 20:19:35 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-05 20:19:35 +0200 |
| commit | 5983a4fa3bae2a13b4f2298adaeb6e6b4d8ac6b8 (patch) | |
| tree | db4c75d240bba3b5e3ab9e6d247e3acd77db5ea0 | |
| parent | 802242b8cd72274b1759838c10d183fdea884f44 (diff) | |
| parent | 738bd7e3aa6af3b9469a0d707470b1395da4c5ba (diff) | |
Merge branch 'master' into _scs
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | make/rules.mk | 13 |
2 files changed, 15 insertions, 16 deletions
@@ -28,14 +28,26 @@ all: init $(SOURCES) init: git submodule init git submodule update - $(if $(dummy_MODULES),mkdir -p $(dummy_MODULES)) touch init -install:: init +install:: init $(dummy_MODULES) ifeq ($(strip $(CONFIGS)),) $(error Please configure ikiwiki.setup and then uncomment it at the top of the Makefile!) endif +content_dummy_master: + mkdir $@ + cd $@ && git init + echo .ikiwiki > $@/.gitignore + cd $@ && git add .gitignore + cd $@ && git commit -m "Ignore .ikiwiki." + +$(dummy_MODULES): content_dummy_master + clone $< $@ + +clean:: + rm -rf content_dummy_master $(dummy_MODULES) + include make/rules.mk pot: $(ALL_POTFILES) @@ -43,4 +55,4 @@ po: $(ALL_POFILES) $(LOCALE_L10NFILES): $(MASTER_L10NFILES) translations: po $(LOCALE_L10NFILES) -.PHONY: all $(SOURCES) pot po translations install ultraclean +.PHONY: all $(SOURCES) pot po translations install clean diff --git a/make/rules.mk b/make/rules.mk index 226d37d..850dcef 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -76,19 +76,6 @@ endif -# 1:dummydir -define DUMMYMODULE_template -$(1): - mkdir -p $$@ - -# WARNING: this may wipe unrelated files too! -ultraclean:: - rm -rf "$(1)" -endef -$(foreach module,$(dummy_MODULES),$(eval $(call DUMMYMODULE_template,$(masterdir)))) - - - # 1:configfile define CONFIG_template $(1): |