Merge branch 'maint'

* maint: git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
2008-03-05 02:13:37 -05:00 · 2008-03-05 02:13:37 -05:00 · f15b75855f
parent f49b6c10b7 21623062ab
commit f15b75855f
1 changed files with 5 additions and 0 deletions
--- a/5
+++ b/5
@ -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