From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Apr 2010 05:22:19 +0000 (-0700)
Subject: Merge branch 'rb/maint-python-path' into maint
X-Git-Tag: v1.7.1-rc1~3^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/581b26c82dd3232b052d5228a1ba2ea3cc03dc28?ds=inline;hp=-c

Merge branch 'rb/maint-python-path' into maint

* rb/maint-python-path:
Correct references to /usr/bin/python which does not exist on FreeBSD
---

581b26c82dd3232b052d5228a1ba2ea3cc03dc28
diff --combined Makefile
index b07cd8a681,5bb0769919..e57d9754e2
--- a/Makefile
+++ b/Makefile
@@@ -831,6 -831,7 +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
@@@ -886,7 -887,6 +887,7 @@@ ifeq ($(uname_S),IRIX
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
 +	NEEDS_LIBICONV = YesPlease
  endif
  ifeq ($(uname_S),IRIX64)
  	NO_SETENV=YesPlease
@@@ -905,7 -905,6 +906,7 @@@
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH=/usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
 +	NEEDS_LIBICONV = YesPlease
  endif
  ifeq ($(uname_S),HP-UX)
  	NO_IPV6=YesPlease