summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-03-05 07:13:37 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-03-05 07:13:37 (GMT)
commitf15b75855fe15ac54adc4908f65e8a7572d47c9f (patch)
treeddaa2e55982c8737c71e05e8a3874a3169b992c8
parentf49b6c10b7ded8c46df8ad52621faf3a04a2aa72 (diff)
parent21623062ab8e2a81dec56c8007a1d147cef1b5e2 (diff)
downloadgit-f15b75855fe15ac54adc4908f65e8a7572d47c9f.zip
git-f15b75855fe15ac54adc4908f65e8a7572d47c9f.tar.gz
git-f15b75855fe15ac54adc4908f65e8a7572d47c9f.tar.bz2
Merge branch 'maint'
* maint: git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 01e0a46..4e32174 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