diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:59:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:59:35 -0700 |
| commit | a6828f536119c3288b0be772e3870f1a464d017d (patch) | |
| tree | b991d1ff6118560c2fdcc78395b977e479b507ce /git-gui/Makefile | |
| parent | Merge branch 'js/remote' (diff) | |
| parent | git-gui: Simplify MSGFMT setting in Makefile (diff) | |
| download | tgif-a6828f536119c3288b0be772e3870f1a464d017d.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Simplify MSGFMT setting in Makefile
git-gui: Add option for changing the width of the commit message text box
git-gui: if a background colour is set, set foreground colour as well
git-gui: translate the remaining messages in zh_cn.po to chinese
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 4e321742ab..b19fb2d64e 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -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 |