@matheusbsbs / matheus-bagliano / commits / 44211e8c2e
Fork 0

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 <tyler@monkeypox.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

R. Tyler Ballance committed Mar 21, 2010 at 12:01 UTC 44211e8c2ea48e1149cb36a02bd54f2d21c207f4
5 files changed +9 -4
Makefile
+1
@@ -831,6 +831,7 @@ ifeq ($(uname_S),FreeBSD)
831 NO_UINTMAX_T = YesPlease
832 NO_STRTOUMAX = YesPlease
833 endif
834 + PYTHON_PATH = /usr/local/bin/python
835 endif
836 ifeq ($(uname_S),OpenBSD)
837 NO_STRCASESTR = YesPlease
contrib/fast-import/import-zips.py
+1 -1
@@ -1,4 +1,4 @@
1 -#!/usr/bin/python
1 +#!/usr/bin/env python
2
3 ## zip archive frontend for git-fast-import
4 ##
contrib/hg-to-git/hg-to-git.py
+1 -1
@@ -1,4 +1,4 @@
1 -#! /usr/bin/python
1 +#!/usr/bin/env python
2
3 """ hg-to-git.py - A Mercurial to GIT converter
4
contrib/p4import/git-p4import.py
+1 -1
@@ -1,4 +1,4 @@
1 -#!/usr/bin/python
1 +#!/usr/bin/env python
2 #
3 # This tool is copyright (c) 2006, Sean Estabrooks.
4 # It is released under the Gnu Public License, version 2.
git_remote_helpers/Makefile
+5 -1
@@ -7,7 +7,11 @@ pysetupfile:=setup.py
7 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
8
9 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
15 endif
16 ifndef prefix
17 prefix = $(HOME)