diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 21:32:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 21:32:38 (GMT) |
| commit | 47c566a4d670e892ffa42fe307c45f41fc5a6ac5 (patch) | |
| tree | 6ce218a854165f685aa72b1b1d56993a0dcace0e /Makefile | |
| parent | 4d2a3011eed6abda1399de2774bd8f08db1581f9 (diff) | |
| parent | ef49e05a6431727b54c399d1f3636c76ac682d61 (diff) | |
| download | git-47c566a4d670e892ffa42fe307c45f41fc5a6ac5.zip git-47c566a4d670e892ffa42fe307c45f41fc5a6ac5.tar.gz git-47c566a4d670e892ffa42fe307c45f41fc5a6ac5.tar.bz2 | |
Merge branch 'jk/make-findstring-makeflags-fix' into maint
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
@@ -1468,13 +1468,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 $@; |