diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-01 12:38:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-01 12:38:07 +0300 |
| commit | 215ae4f264df28d495fd788b5ac6730f10e9cb4b (patch) | |
| tree | 7c7077da2b424d8076e53d2803125bb71a12f9d5 /shared.mak | |
| parent | 7452749a781d84244ecd08c6f6ca7e5df67dfce8 (diff) | |
| parent | 67b36879fc06581131fa7e57c9ee1e560ea9d1fc (diff) | |
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
Diffstat (limited to 'shared.mak')
| -rw-r--r-- | shared.mak | 4 |
1 files changed, 2 insertions, 2 deletions
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= |