diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-10 09:22:19 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-10 09:22:19 +0400 |
| commit | 581b26c82dd3232b052d5228a1ba2ea3cc03dc28 (patch) | |
| tree | d2c224f93b5f6b9338bc011b7d4969734ac66192 | |
| parent | 5d4bd79d8002ee199c6561b2a10466c347caf2fa (diff) | |
| parent | 44211e8c2ea48e1149cb36a02bd54f2d21c207f4 (diff) | |
Merge branch 'rb/maint-python-path' into maint
* rb/maint-python-path:
Correct references to /usr/bin/python which does not exist on FreeBSD
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | contrib/fast-import/import-zips.py | 2 | ||||
| -rwxr-xr-x | contrib/hg-to-git/hg-to-git.py | 2 | ||||
| -rw-r--r-- | contrib/p4import/git-p4import.py | 2 | ||||
| -rw-r--r-- | git_remote_helpers/Makefile | 6 |
5 files changed, 9 insertions, 4 deletions
@@ -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 diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py index 7051a83a59..82f5ed3ddc 100755 --- a/contrib/fast-import/import-zips.py +++ b/contrib/fast-import/import-zips.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python ## zip archive frontend for git-fast-import ## diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 854cd94ba5..046cb2b268 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/env python """ hg-to-git.py - A Mercurial to GIT converter diff --git a/contrib/p4import/git-p4import.py b/contrib/p4import/git-p4import.py index 0f3d97b67e..b6e534b65b 100644 --- a/contrib/p4import/git-p4import.py +++ b/contrib/p4import/git-p4import.py @@ -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. diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile index c62dfd0f4d..74b05dc91e 100644 --- a/git_remote_helpers/Makefile +++ b/git_remote_helpers/Makefile @@ -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) |