From: John Keeping <john@keeping.me.uk>
Date: Sat, 5 Sep 2015 12:22:10 +0000 (+0100)
Subject: Makefile: fix MAKEFLAGS tests with multiple flags
X-Git-Tag: v2.6.2~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef49e05a6431727b54c399d1f3636c76ac682d61;p=thirdparty%2Fgit.git

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index bab7565563..ef95ada06c 100644
--- a/Makefile
+++ b/Makefile
@@ -608,13 +608,13 @@ endif
 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 = :
 endif
 
-ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifneq ($(findstring s,$(MAKEFLAGS)),s)
 ifndef V
 	QUIET_CC       = @echo '   ' CC $@;
 	QUIET_AR       = @echo '   ' AR $@;