summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-10-05 20:19:36 +0200
committerJonas Smedegaard <dr@jones.dk>2010-10-05 20:19:36 +0200
commit640696a9e90273b5a755310722afd19e1865e0a1 (patch)
tree5ebdad9b242096475d6e459566574943e2e49418
parent5b718600c4cc9e664cca76ce921753baf4efc2b7 (diff)
parent738bd7e3aa6af3b9469a0d707470b1395da4c5ba (diff)
Merge branch 'master' into _nb
-rw-r--r--Makefile18
-rw-r--r--make/rules.mk13
2 files changed, 15 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index c0c4165..a1bb03e 100644
--- a/Makefile
+++ b/Makefile
@@ -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):