From 05169c2a79649f8e61464aae1f105f86d4f2b17f Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 30 Jan 2011 16:03:45 +0100
Subject: Avoid invoking init target by default, and have it fully bootstrap,
 optionally extended.

---
 Makefile | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 603814c..43db4bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,27 @@
+IKIWIKI_OPTIONS ?= \
+	--set srcdir=$(CURDIR)/content \
+	--set destdir=$(CURDIR)/build/html
+
+-include shared/include.mk
+-include config/include.mk
+
 all: build
 
-init:
+init: submodules config content
+
+submodules:
 	git submodule init
 	git submodule update --init --recursive
-	touch $@
 
-build: init
+config:
+	mkdir -p "$@"
+	[ -e "$@/ikiwiki.setup" ] || ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup "$@/ikiwiki.setup"
+
+content:
+	mkdir -p "$@"
+	[ -e "$@/index.mdwn" ] || printf "# Hello world!\n\nHello world!\n" > "$@/index.mdwn"
+
+build: config
 	find config -name '*.setup' -exec ikiwiki --setup '{}' --rebuild ';'
 
-.PHONY: all init build
+.PHONY: all build submodules
-- 
cgit v1.2.3