Merge branch 'maint'

* maint: git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
git-mirror · Mar 5, 2008 · f15b758 · f15b758
2 parents f49b6c1 + 2162306
commit f15b758
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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