summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-13 06:14:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-13 06:14:07 (GMT)
commit27ebd6e0443bdd795869f598ecebc9eadd64a26c (patch)
tree743be51f078dd661f156ee66b3536c910d913dc9
parent9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4 (diff)
parent2ec0cb7959b0bf965d54f95453f5b4b34e8d3100 (diff)
downloadgit-27ebd6e0443bdd795869f598ecebc9eadd64a26c.zip
git-27ebd6e0443bdd795869f598ecebc9eadd64a26c.tar.gz
git-27ebd6e0443bdd795869f598ecebc9eadd64a26c.tar.bz2
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
-rw-r--r--git-gui/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index d74fca2..b82789e 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))