Skip to content

Commit 1375fdc

Browse files
git-gui: silence install recipes under "make -s"
Several install and uninstall recipes embed "echo" calls that fire as part of the recipe itself, so the install banners (DEST, INSTALL, LINK, REMOVE) were visible whenever the variables expand non-empty. Guard the whole "ifndef V" block on "-s" so the loud variants are selected only when "-s" is absent and V=1 is unset. The existing "-s" check also had its findstring arguments in the wrong order (needle "-s" never fit in haystack "s"), so swap them while moving the check to wrap the block. Signed-off-by: Harald Nordgren <harald.nordgren@kostdoktorn.se>
1 parent 9ac3f19 commit 1375fdc

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

git-gui/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ REMOVE_F0 = $(RM_RF) # space is required here
6464
REMOVE_F1 =
6565
CLEAN_DST = true
6666

67+
ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
6768
ifndef V
6869
QUIET = @
6970
QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
@@ -89,6 +90,7 @@ ifndef V
8990
REMOVE_F0 = dst=
9091
REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
9192
endif
93+
endif
9294

9395
TCLTK_PATH ?= wish
9496
ifeq (./,$(dir $(TCLTK_PATH)))
@@ -97,10 +99,6 @@ else
9799
TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
98100
endif
99101

100-
ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
101-
QUIET_GEN =
102-
endif
103-
104102
-include config.mak
105103

106104
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))

0 commit comments

Comments
 (0)