summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2008-02-27 19:29:34 -0500
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-03-05 02:13:16 -0500
commit21623062ab8e2a81dec56c8007a1d147cef1b5e2 (patch)
tree8870057b121dec0c4589b3b9be7a90ab2d077fc0
parentgit-gui: Paper bag fix info dialog when no files are staged at commit (diff)
downloadtgif-21623062ab8e2a81dec56c8007a1d147cef1b5e2.tar.xz
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>
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 01e0a46ba5..4e321742ab 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