diff options
| author | John Keeping <john@keeping.me.uk> | 2015-09-05 14:32:50 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2015-10-09 10:56:06 +0200 |
| commit | 35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67 (patch) | |
| tree | fc8a307895f90c274b58c4f1394576115326c735 /Makefile | |
| parent | ui-refs: remove useless null check (diff) | |
| download | cgit-pink-35b3c67ac285f0c488b0d3042a1bbc44ef4f1f67.tar.gz cgit-pink-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>
Diffstat (limited to 'Makefile')
| -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 QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = -ifneq ($(findstring $(MAKEFLAGS),w),w) +ifneq ($(findstring w,$(MAKEFLAGS)),w) PRINT_DIR = --no-print-directory else # "make -w" NO_SUBDIR = : |