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
This commit is contained in:
@ -224,6 +224,11 @@ else
|
|||||||
ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
|
ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
|
||||||
MSGFMT := $(TCL_PATH) po/po2msg.sh
|
MSGFMT := $(TCL_PATH) po/po2msg.sh
|
||||||
endif
|
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
|
endif
|
||||||
|
|
||||||
msgsdir = $(gg_libdir)/msgs
|
msgsdir = $(gg_libdir)/msgs
|
||||||
|
Reference in New Issue
Block a user