diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-06 00:18:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-06 00:18:23 -0800 |
| commit | 891e85a0c08e12d3f6174d8eb10b4ef284c4b01b (patch) | |
| tree | d190f2639705455b18997d4d56ea4c68ae05fc36 /git-gui | |
| parent | 52dce39762fbec75b2d561e5dedb25b8e51f83eb (diff) | |
| parent | 21623062ab8e2a81dec56c8007a1d147cef1b5e2 (diff) | |
| download | git-891e85a0c08e12d3f6174d8eb10b4ef284c4b01b.tar.gz git-891e85a0c08e12d3f6174d8eb10b4ef284c4b01b.tar.xz | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
Diffstat (limited to 'git-gui')
| -rw-r--r-- | git-gui/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 01e0a46ba..4e321742a 100644 --- a/git-gui/Makefile +++ b/git-gui/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 |