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

From: R. Tyler Ballance <tyler@monkeypox.org>
Date: Mar 21, 2010, 21:23 UTC
Message-ID: <20100321212335.GB32016@kiwi.sharlinx.com>
In-Reply-To: <7veijdl6kp.fsf@alter.siamese.dyndns.org>

On Sun, 21 Mar 2010, Junio C Hamano wrote:

Show 7 quoted lines

> "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?

Sorry, I was under the impression somebody who knew what the hell they were doing would be the one adding a Sign-off By to the commit :)

Show 33 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?

No, that looks right, I didn't notice the specialized section towards the bottom for FreeBSD or the others for that matter.

Third time's the charm

Cheers,
-R. Tyler Ballance
--------------------------------------
 Jabber: rtyler@jabber.org
 GitHub: http://github.com/rtyler
Twitter: http://twitter.com/agentdero
   Blog: http://unethicalblogger.com