From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 28 Feb 2008 00:29:34 +0000 (-0500)
Subject: git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
X-Git-Tag: v1.5.4.4~12^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=21623062ab8e2a81dec56c8007a1d147cef1b5e2;p=git.git

git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails

Mac OS X Tiger may have a msgfmt available but it doesn't understand
how to implement --tcl.  Falling back to po2msg.sh on such systems
is a reasonable behavior.

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

diff --git a/Makefile b/Makefile
index 01e0a46ba..4e321742a 100644
--- a/Makefile
+++ b/Makefile
@@ -224,6 +224,11 @@ else
 	ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
 		MSGFMT := $(TCL_PATH) po/po2msg.sh
 	endif
+	ifeq (msgfmt,$(MSGFMT))
+	ifeq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null || echo $?),1)
+		MSGFMT := $(TCL_PATH) po/po2msg.sh
+	endif
+	endif
 endif
 
 msgsdir     = $(gg_libdir)/msgs