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>
John Keeping committed
Sep 5, 2015 at 13:22 UTC
ef49e05a6431727b54c399d1f3636c76ac682d61
1 file changed
+2
-2
Makefile
+2
-2
@@ -608,13 +608,13 @@ endif
608
QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
609
QUIET_SUBDIR1 =
610
611
-ifneq ($(findstring $(MAKEFLAGS),w),w)
611
+ifneq ($(findstring w,$(MAKEFLAGS)),w)
612
PRINT_DIR = --no-print-directory
613
else # "make -w"
614
NO_SUBDIR = :
615
endif
616
617
-ifneq ($(findstring $(MAKEFLAGS),s),s)
617
+ifneq ($(findstring s,$(MAKEFLAGS)),s)
618
ifndef V
619
QUIET_CC = @echo ' ' CC $@;
620
QUIET_AR = @echo ' ' AR $@;