summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-04-20 17:00:11 +0200
committerJonas Smedegaard <dr@jones.dk>2011-04-20 17:00:11 +0200
commit67ebdd764b3a19809e16d19741aa9c9416898b6a (patch)
tree5edfeb65b6940bc273ff030da5311c3f243a4486
parenta7adf74c4fa82c5a46f039c56399d17f6dbc9122 (diff)
Only force-rebuild ikiwiki when using make always-make option -B.
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2cf2fe9..be53be3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ IKIWIKI_OPTIONS ?= \
-include shared/themes/Makefile
+always-make = $(filter -B,$(MAKEFLAGS))
avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo --no-rcs)
all: build
@@ -30,6 +31,6 @@ content: submodules
[ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn'
build: $(cssfiles)
- find config -name *.setup -exec ikiwiki --setup '{}' $(avoid-broken-git) --rebuild ';'
+ find config -name *.setup -exec ikiwiki --setup '{}' $(avoid-broken-git) $(if $(always-make),--rebuild) ';'
.PHONY: all build submodules content