Skip to content

Commit 44211e8

Browse files
R. Tyler Ballancegitster
authored andcommitted
Correct references to /usr/bin/python which does not exist on FreeBSD
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. Signed-off-by: R. Tyler Ballance <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0b3dcfe commit 44211e8

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@ ifeq ($(uname_S),FreeBSD)
831831
NO_UINTMAX_T = YesPlease
832832
NO_STRTOUMAX = YesPlease
833833
endif
834+
PYTHON_PATH = /usr/local/bin/python
834835
endif
835836
ifeq ($(uname_S),OpenBSD)
836837
NO_STRCASESTR = YesPlease

contrib/fast-import/import-zips.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python
22

33
## zip archive frontend for git-fast-import
44
##

contrib/hg-to-git/hg-to-git.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /usr/bin/python
1+
#!/usr/bin/env python
22

33
""" hg-to-git.py - A Mercurial to GIT converter
44

contrib/p4import/git-p4import.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python
22
#
33
# This tool is copyright (c) 2006, Sean Estabrooks.
44
# It is released under the Gnu Public License, version 2.

git_remote_helpers/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ pysetupfile:=setup.py
77
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
88

99
ifndef PYTHON_PATH
10-
PYTHON_PATH = /usr/bin/python
10+
ifeq ($(uname_S),FreeBSD)
11+
PYTHON_PATH = /usr/local/bin/python
12+
else
13+
PYTHON_PATH = /usr/bin/python
14+
endif
1115
endif
1216
ifndef prefix
1317
prefix = $(HOME)

0 commit comments

Comments
 (0)