Merge branch 'rb/maint-python-path'

* rb/maint-python-path:
  Correct references to /usr/bin/python which does not exist on FreeBSD
This commit is contained in:
Junio C Hamano 2010-04-03 12:28:41 -07:00
commit 4de113cdf5
5 changed files with 9 additions and 4 deletions

View File

@ -866,6 +866,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

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
## zip archive frontend for git-fast-import
##

View File

@ -1,4 +1,4 @@
#! /usr/bin/python
#!/usr/bin/env python
""" hg-to-git.py - A Mercurial to GIT converter

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
#
# This tool is copyright (c) 2006, Sean Estabrooks.
# It is released under the Gnu Public License, version 2.

View File

@ -7,7 +7,11 @@ pysetupfile:=setup.py
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
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
ifndef prefix
prefix = $(HOME)