Skip to content

Commit

Permalink
Correct references to /usr/bin/python which does not exist on FreeBSD
Browse files Browse the repository at this point in the history
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 <tyler@monkeypox.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
R. Tyler Ballance authored and Junio C Hamano committed Mar 24, 2010
1 parent 0b3dcfe commit 44211e8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/fast-import/import-zips.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

## zip archive frontend for git-fast-import
##
Expand Down
2 changes: 1 addition & 1 deletion contrib/hg-to-git/hg-to-git.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#!/usr/bin/env python

""" hg-to-git.py - A Mercurial to GIT converter
Expand Down
2 changes: 1 addition & 1 deletion contrib/p4import/git-p4import.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 5 additions & 1 deletion git_remote_helpers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 44211e8

Please sign in to comment.