about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2015-09-05 14:32:50 +0100
committerJason A. Donenfeld2015-10-09 10:56:06 +0200
commit35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67 (patch)
treefc8a307895f90c274b58c4f1394576115326c735
parentui-refs: remove useless null check (diff)
downloadcgit-35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67.tar.gz
cgit-35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67.zip
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>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 138fe5b..77b9f60 100644 --- a/Makefile +++ b/Makefile
@@ -48,7 +48,7 @@ export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG
48QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir 48QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
49QUIET_SUBDIR1 = 49QUIET_SUBDIR1 =
50 50
51ifneq ($(findstring $(MAKEFLAGS),w),w) 51ifneq ($(findstring w,$(MAKEFLAGS)),w)
52PRINT_DIR = --no-print-directory 52PRINT_DIR = --no-print-directory
53else # "make -w" 53else # "make -w"
54NO_SUBDIR = : 54NO_SUBDIR = :