diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:29:52 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-03-12 01:48:32 -0400 |
| commit | 7276607886e99fa3bb5f0ddadb9f0daeb3958d2d (patch) | |
| tree | 5a812b470a61045c03d29b9ee205cd3ead8bdf2c | |
| parent | 11027d544b4f6aed0b84111a2122224cd201a182 (diff) | |
| download | git-7276607886e99fa3bb5f0ddadb9f0daeb3958d2d.tar.gz git-7276607886e99fa3bb5f0ddadb9f0daeb3958d2d.tar.xz | |
git-gui: Simplify MSGFMT setting in Makefile
To prepare msg files for Tcl scripts, the command that is set to MSGFMT
make variable needs to be able to grok "--tcl -l <lang> -d <here>" options
correctly. This patch simplifies the tests done in git-gui's Makefile to
directly test this condition. If the test run does not exit properly with
zero status (either because you do not have "msgfmt" itself, or your
"msgfmt" is too old to grok --tcl option --- the reason does not matter),
have it fall back to po/po2msg.sh
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -221,14 +221,9 @@ ifdef NO_MSGFMT MSGFMT ?= $(TCL_PATH) po/po2msg.sh else MSGFMT ?= msgfmt - ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127) + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) 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 |