From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Oct 2015 21:32:38 +0000 (-0700)
Subject: Merge branch 'jk/make-findstring-makeflags-fix' into maint
X-Git-Tag: v2.6.2~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/47c566a4d670e892ffa42fe307c45f41fc5a6ac5?hp=4d2a3011eed6abda1399de2774bd8f08db1581f9

Merge branch 'jk/make-findstring-makeflags-fix' into maint

Customization to change the behaviour with "make -w" and "make -s"
in our Makefile was broken when they were used together.

* jk/make-findstring-makeflags-fix:
Makefile: fix MAKEFLAGS tests with multiple flags
---

diff --git a/Makefile b/Makefile
index 0f68c7075d..04c2231023 100644
--- a/Makefile
+++ b/Makefile
@@ -1468,13 +1468,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 $@;