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 <john@keeping.me.uk>

diff --git a/Makefile b/Makefile
index 138fe5b3e49e9f6b3c2bf170567f2dcdefbccec6..77b9f60d3275a63da579624fb9c79d6f9707cb3e 100644 (file)
--- 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  =
 
 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 = :
 PRINT_DIR = --no-print-directory
 else # "make -w"
 NO_SUBDIR = :