aboutsummaryrefslogtreecommitdiff
path: root/git_remote_helpers
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-03 12:28:41 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-03 12:28:41 -0700
commit4de113cdf55631ef1f8bf34658fb647509520e8a (patch)
treec26cdceca94648fc281bb0259bd44faa3c983247 /git_remote_helpers
parent16b8a3e4b94dc7f6e05b624eae3cf1eed7b358a5 (diff)
parent44211e8c2ea48e1149cb36a02bd54f2d21c207f4 (diff)
downloadgit-4de113cdf55631ef1f8bf34658fb647509520e8a.tar.gz
git-4de113cdf55631ef1f8bf34658fb647509520e8a.tar.xz
Merge branch 'rb/maint-python-path'
* rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD
Diffstat (limited to 'git_remote_helpers')
-rw-r--r--git_remote_helpers/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile
index c62dfd0f4..74b05dc91 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)