[PATCH v2] Correct references to /usr/bin/python which does not exist on FreeBSD
From: R. Tyler Ballance <hidden>
Date: 2016-06-15 22:48:28
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
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. --- Makefile | 6 +++++- contrib/fast-import/import-zips.py | 2 +- contrib/hg-to-git/hg-to-git.py | 2 +- contrib/p4import/git-p4import.py | 2 +- git_remote_helpers/Makefile | 6 +++++- 5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 3a6c6ea..4f8fbf0 100644
--- a/Makefile
+++ b/Makefile@@ -444,7 +444,11 @@ ifndef PERL_PATH PERL_PATH = /usr/bin/perl endif 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 export PERL_PATH
diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py
index 7051a83..82f5ed3 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 854cd94..046cb2b 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 0f3d97b..b6e534b 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 c62dfd0..74b05dc 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)
--
1.6.4.3Attachments
- (unnamed) [application/pgp-signature] 198 bytes