diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-03-05 02:13:37 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-03-05 02:13:37 -0500 |
| commit | f15b75855fe15ac54adc4908f65e8a7572d47c9f (patch) | |
| tree | ddaa2e55982c8737c71e05e8a3874a3169b992c8 | |
| parent | f49b6c10b7ded8c46df8ad52621faf3a04a2aa72 (diff) | |
| parent | 21623062ab8e2a81dec56c8007a1d147cef1b5e2 (diff) | |
| download | git-f15b75855fe15ac54adc4908f65e8a7572d47c9f.tar.gz git-f15b75855fe15ac54adc4908f65e8a7572d47c9f.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
| -rw-r--r-- | Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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 |