From 9c341524045e44136f9553441a975c9f487a645a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 2 Dec 2013 17:52:15 +0100 Subject: Explicitly refresh when not forcing rebuild: ikiwiki man page lie about default. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 39dcbf1..2f20b58 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3 From 758b45a8370f11736b8691bf4e48de52d7cdaf5d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 2 Dec 2013 18:09:25 +0100 Subject: Fix detect forced build. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2f20b58..1f0366d 100644 --- a/Makefile +++ b/Makefile @@ -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) -- cgit v1.2.3 From 5d84ebe95e4e010e27292716aa45d3fc18200998 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Jan 2015 18:05:15 +0100 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 0a8db3d..8418a77 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 0a8db3d29e26b2e31b0d61488a7a59c439c08a8b +Subproject commit 8418a770a2be476ecd961d3279d00e151a0a5318 -- cgit v1.2.3