Merge branch 'rb/maint-python-path' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:22:19 +0000 (22:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:22:19 +0000 (22:22 -0700)
* rb/maint-python-path:
Correct references to /usr/bin/python which does not exist on FreeBSD

1  2 
Makefile
diff --combined Makefile
index b07cd8a68146047ed3e7a5a17a420ad0ff5576f8,5bb07699191c29516e247f13161479cefd1807b5..e57d9754e28f280cb3074094c800c97dbdb91d12
+++ 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
        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