Re: [PATCH] Simplify MSGFMT setting in Makefile

From: Shawn O. Pearce <spearce@spearce.org>
Date: Mar 12, 2008, 05:51 UTC
Message-ID: <20080312055153.GS8410@spearce.org>
In-Reply-To: <7vr6eg7bn3.fsf_-_@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> wrote:

> To prepare msg files for Tcl scripts, the command that is set to MSGFMT

...

Thanks.

>  * I am planning to close 'master' for -rc1 by the end of this week, so
>    please plan to tell me to pull if you have accumulated changes,
>    thanks.

Please pull. What is in my master right now (7276607 which is this patch) will likely be gitgui-0.10.0. I'm unlikely to have any further changes (beyond perhaps updated po files) between now and 1.5.5 final.

Show 13 quoted lines

>  Makefile |    7 +------
>  1 files changed, 1 insertions(+), 6 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 4e32174..95e99f2 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -221,14 +221,9 @@ ifdef NO_MSGFMT
>  	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
>  else
>  	MSGFMT ?= msgfmt
> -	ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
> +	ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)

Missing a $ here, it should be $$? not $?.  Fixed up when I applied.

-- 
Shawn.