diff options
| author | John Keeping | 2015-09-05 14:32:50 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld | 2015-10-09 10:56:06 +0200 |
| commit | 35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67 (patch) | |
| tree | fc8a307895f90c274b58c4f1394576115326c735 | |
| parent | ui-refs: remove useless null check (diff) | |
| download | cgit-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-- | Makefile | 2 |
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 | |||
| 48 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 48 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
| 49 | QUIET_SUBDIR1 = | 49 | QUIET_SUBDIR1 = |
| 50 | 50 | ||
| 51 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 51 | ifneq ($(findstring w,$(MAKEFLAGS)),w) |
| 52 | PRINT_DIR = --no-print-directory | 52 | PRINT_DIR = --no-print-directory |
| 53 | else # "make -w" | 53 | else # "make -w" |
| 54 | NO_SUBDIR = : | 54 | NO_SUBDIR = : |