From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 3 Sep 2007 22:54:14 +0000 (-0400)
Subject: git-gui: Ensure msgfmt failure stops GNU make
X-Git-Tag: gitgui-0.9.0~83
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=12fb223326b561132d528bb010c6bdeaa828acd3;p=git.git

git-gui: Ensure msgfmt failure stops GNU make

If we have a failure executing msgfmt (such as the process just
crashes no matter what arguments you supply it because its own
installation is borked) we should stop the build process rather
than letting it continue along its merry way as if the .msg files
were created.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/Makefile b/Makefile
index 875edacac..df6f6b727 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ ifndef V
 	QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
 	QUIET_BUILT_IN = $(QUIET)echo '   ' BUILTIN $@ &&
 	QUIET_INDEX    = $(QUIET)echo '   ' INDEX $(dir $@) &&
-	QUIET_MSGFMT0  = $(QUIET)printf '    MSGFMT %12s ' $@ &&
-	QUIET_MSGFMT1  = 2>&1 | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
+	QUIET_MSGFMT0  = $(QUIET)printf '    MSGFMT %12s ' $@ && v=`
+	QUIET_MSGFMT1  = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
 	QUIET_2DEVNULL = 2>/dev/null
 
 	INSTALL_D0 = dir=