undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: fix MAKEFLAGS tests with multiple flags

Browse Source 
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>
This commit is contained in:
John Keeping 2015-09-05 13:22:10 +01:00 committed by Junio C Hamano
parent a6f37099d0
commit ef49e05a64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -608,13 +608,13 @@ endif
QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 = QUIET_SUBDIR1 =
ifneq ($(findstring $(MAKEFLAGS),w),w) ifneq ($(findstring w,$(MAKEFLAGS)),w)
PRINT_DIR = --no-print-directory PRINT_DIR = --no-print-directory
else # "make -w" else # "make -w"
NO_SUBDIR = : NO_SUBDIR = :
endif endif
ifneq ($(findstring $(MAKEFLAGS),s),s) ifneq ($(findstring s,$(MAKEFLAGS)),s)
ifndef V ifndef V
QUIET_CC = @echo ' ' CC $@; QUIET_CC = @echo ' ' CC $@;
QUIET_AR = @echo ' ' AR $@; QUIET_AR = @echo ' ' AR $@;