summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-16 14:32:38 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-16 14:32:38 -0700
commit47c566a4d670e892ffa42fe307c45f41fc5a6ac5 (patch)
tree6ce218a854165f685aa72b1b1d56993a0dcace0e /Makefile
parent4d2a3011eed6abda1399de2774bd8f08db1581f9 (diff)
parentef49e05a6431727b54c399d1f3636c76ac682d61 (diff)
downloadgit-47c566a4d670e892ffa42fe307c45f41fc5a6ac5.tar.gz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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 $@;