summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2015-09-05 13:22:10 +0100
committerJunio C Hamano <gitster@pobox.com>2015-09-10 09:26:23 -0700
commitef49e05a6431727b54c399d1f3636c76ac682d61 (patch)
treee4cef956774b41792ff8135fa664f00bb1d02e34
parenta6f37099d0fce10b536abc1d1a8111460638bac0 (diff)
downloadgit-jk/make-findstring-makeflags-fix.tar.gz
Makefile: fix MAKEFLAGS tests with multiple flagsjk/make-findstring-makeflags-fix
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>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
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 $@;