Skip to content

Commit 215ae4f

Browse files
committed
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
2 parents 7452749 + 67b3687 commit 215ae4f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

git-gui/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ ifeq ($(uname_S),Darwin)
116116
TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
117117
endif
118118

119-
ifeq ($(findstring $(MAKEFLAGS),s),s)
119+
ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
120120
QUIET_GEN =
121121
endif
122122

shared.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ space := $(empty) $(empty)
3737
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
3838
QUIET_SUBDIR1 =
3939

40-
ifneq ($(findstring w,$(MAKEFLAGS)),w)
40+
ifneq ($(findstring w,$(firstword -$(MAKEFLAGS))),w)
4141
PRINT_DIR = --no-print-directory
4242
else # "make -w"
4343
NO_SUBDIR = :
4444
endif
4545

46-
ifneq ($(findstring s,$(MAKEFLAGS)),s)
46+
ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
4747
ifndef V
4848
## common
4949
QUIET_SUBDIR0 = +@subdir=

0 commit comments

Comments
 (0)