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

Junio C Hamano · Junio C Hamano · commit 27ebd6e0443b · 2007-03-12T23:14:07.000-07:00
* '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
@@ -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))
