undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/gnumake-4.4-fix'

Browse Source 
Adjust our Makefiles for GNUmake 4.4

* ab/gnumake-4.4-fix:
  Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
This commit is contained in:
Junio C Hamano 2022-12-01 18:38:07 +09:00
commit 215ae4f264
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui/Makefile
View File

@ -116,7 +116,7 @@ ifeq ($(uname_S),Darwin)
TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app) TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
endif endif
ifeq ($(findstring $(MAKEFLAGS),s),s) ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
QUIET_GEN = QUIET_GEN =
endif endif

4
shared.mak
View File

@ -37,13 +37,13 @@ space := $(empty) $(empty)
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 = QUIET_SUBDIR1 =
ifneq ($(findstring w,$(MAKEFLAGS)),w) ifneq ($(findstring w,$(firstword -$(MAKEFLAGS))),w)
PRINT_DIR = --no-print-directory PRINT_DIR = --no-print-directory
else # "make -w" else # "make -w"
NO_SUBDIR = : NO_SUBDIR = :
endif endif
ifneq ($(findstring s,$(MAKEFLAGS)),s) ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
ifndef V ifndef V
## common ## common
QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR0 = +@subdir=