From 738bd7e3aa6af3b9469a0d707470b1395da4c5ba Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 5 Oct 2010 20:19:24 +0200
Subject: Create dummy git repos for dummy content (not-git folders may upset
 Ikiwiki). Clean dummy content dirs in clean (not ultraclean).

---
 Makefile      | 18 +++++++++++++++---
 make/rules.mk | 13 -------------
 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):
-- 
cgit v1.2.3