Re: [PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 21, 2010, 21:15 UTC
Message-ID: <7veijdl6kp.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100321190145.GA32578@kiwi.sharlinx.com>

"R. Tyler Ballance" <tyler@monkeypox.org> writes:

> On FreeBSD, Python does not ship as part of the base system but is available
> via the ports system, which install the binary in /usr/local/bin.
> ---

Sign-off?

Show 15 quoted lines

> diff --git a/Makefile b/Makefile
> index 3a6c6ea..4f8fbf0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -444,7 +444,11 @@ ifndef PERL_PATH
>  	PERL_PATH = /usr/bin/perl
>  endif
>  ifndef PYTHON_PATH
> -	PYTHON_PATH = /usr/bin/python
> +	ifeq ($(uname_S),FreeBSD)
> +		PYTHON_PATH = /usr/local/bin/python
> +	else
> +		PYTHON_PATH = /usr/bin/python
> +	endif
>  endif

I would have expected that the patch would look more like this:

diff --git a/Makefile b/Makefile
index 98372eb..5bb0769 100644
--- a/Makefile
+++ b/Makefile
@@ -831,6 +831,7 @@ ifeq ($(uname_S),FreeBSD)
 		NO_UINTMAX_T = YesPlease
 		NO_STRTOUMAX = YesPlease
 	endif
+	PYTHON_PATH = /usr/local/bin/python
 endif
 ifeq ($(uname_S),OpenBSD)
 	NO_STRCASESTR = YesPlease

What am I missing?