From 35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 5 Sep 2015 14:32:50 +0100 Subject: Makefile: fix MAKEFLAGS tests with multiple flags findstring is defined as $(findstring FIND,IN) so if multiple flags are set these tests do the wrong thing unless $(MAKEFLAGS) is the second argument. Signed-off-by: John Keeping --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 138fe5b..77b9f60 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = -ifneq ($(findstring $(MAKEFLAGS),w),w) +ifneq ($(findstring w,$(MAKEFLAGS)),w) PRINT_DIR = --no-print-directory else # "make -w" NO_SUBDIR = : -- cgit v1.2.1