diff options
author | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 19:20:16 +0100 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 19:20:16 +0100 |
commit | 382bf49d2fdf88eb36b60a6e8889c3533c7e5bd4 (patch) | |
tree | 5f0d782a4f6f6b6b0933266175cc0abea91d1480 /Makefile | |
parent | b17f399b1cfbcf4a62d54192320c3b1c9aec43e5 (diff) | |
parent | d54c69f1c554e4b1434f208b33fcde9c553e3c63 (diff) |
Merge branch 'master' of git://source.jones.dk/ikiwiki/site
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -19,7 +19,7 @@ all: build -include config/include.mk -include shared/themes/include.mk -always-make = $(filter -B,$(MAKEFLAGS)) +always-make = $(findstring B,$(MAKEFLAGS)) avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs") iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup) @@ -48,6 +48,6 @@ content: build: $(if $(cssprojects),$(MAKE) $(cssprojects)) - $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild);) + $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) .PHONY: all build configfiles |