diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:20 -0700 |
| commit | 96090283e0ba646c599b6a15834bdbb8dd731b4a (patch) | |
| tree | 5cca5a4dbe82d1817ab89dd3e2b57e483aca8ee6 /Makefile | |
| parent | Merge branch 'sb/submodule-helper' (diff) | |
| parent | Makefile: fix MAKEFLAGS tests with multiple flags (diff) | |
| download | tgif-96090283e0ba646c599b6a15834bdbb8dd731b4a.tar.xz | |
Merge branch 'jk/make-findstring-makeflags-fix'
Customization to change the behaviour with "make -w" and "make -s"
in our Makefile was broken when they were used together.
* jk/make-findstring-makeflags-fix:
Makefile: fix MAKEFLAGS tests with multiple flags
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1466,13 +1466,13 @@ endif 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 = : endif -ifneq ($(findstring $(MAKEFLAGS),s),s) +ifneq ($(findstring s,$(MAKEFLAGS)),s) ifndef V QUIET_CC = @echo ' ' CC $@; QUIET_AR = @echo ' ' AR $@; |