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

[thirdparty/git.git] / Makefile

diff --git a/Makefile b/Makefile
index 1d102251768c313b125055d981be483fc48b99b9..4908c867dea2182e286ba667d02eef4431067540 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1466,13 +1466,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 $@;