diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-01 18:38:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-01 18:38:07 +0900 |
| commit | 215ae4f264df28d495fd788b5ac6730f10e9cb4b (patch) | |
| tree | 7c7077da2b424d8076e53d2803125bb71a12f9d5 | |
| parent | Git 2.39-rc1 (diff) | |
| parent | Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4 (diff) | |
| download | git-215ae4f264df28d495fd788b5ac6730f10e9cb4b.tar.gz git-215ae4f264df28d495fd788b5ac6730f10e9cb4b.zip | |
Merge branch 'ab/gnumake-4.4-fix'
Adjust our Makefiles for GNUmake 4.4
* ab/gnumake-4.4-fix:
Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
| -rw-r--r-- | git-gui/Makefile | 2 | ||||
| -rw-r--r-- | shared.mak | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 56c85a85c1..a0d5a4b28e 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -116,7 +116,7 @@ ifeq ($(uname_S),Darwin) TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app) endif -ifeq ($(findstring $(MAKEFLAGS),s),s) +ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s) QUIET_GEN = endif diff --git a/shared.mak b/shared.mak index be1f30ff20..aeb80fc4d5 100644 --- a/shared.mak +++ b/shared.mak @@ -37,13 +37,13 @@ space := $(empty) $(empty) QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = -ifneq ($(findstring w,$(MAKEFLAGS)),w) +ifneq ($(findstring w,$(firstword -$(MAKEFLAGS))),w) PRINT_DIR = --no-print-directory else # "make -w" NO_SUBDIR = : endif -ifneq ($(findstring s,$(MAKEFLAGS)),s) +ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s) ifndef V ## common QUIET_SUBDIR0 = +@subdir= |