crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests 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>
This commit is contained in:
John Keeping 2015-09-05 14:32:50 +01:00 committed by Jason A. Donenfeld
parent 198a4404b9
commit 35b3c67ac2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -48,7 +48,7 @@ export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG
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 = :