From: Junio C Hamano <junkio@cox.net>
Date: Tue, 13 Mar 2007 06:14:07 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.5.1-rc1~41
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/27ebd6e0443bdd795869f598ecebc9eadd64a26c?hp=9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
git-gui: Support of "make -s" in: do not output anything of the build itself
---

diff --git a/git-gui/Makefile b/git-gui/Makefile
index d74fca2874..b82789ead6 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -28,6 +28,11 @@ ifndef V
 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 endif
 
+ifeq ($(findstring $(MAKEFLAGS),s),s)
+QUIET_GEN =
+QUIET_BUILT_IN =
+endif
+
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))