diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:22:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:22:19 -0700 |
| commit | 581b26c82dd3232b052d5228a1ba2ea3cc03dc28 (patch) | |
| tree | d2c224f93b5f6b9338bc011b7d4969734ac66192 /git_remote_helpers | |
| parent | 5d4bd79d8002ee199c6561b2a10466c347caf2fa (diff) | |
| parent | 44211e8c2ea48e1149cb36a02bd54f2d21c207f4 (diff) | |
Merge branch 'rb/maint-python-path' into maint
* 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/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile index c62dfd0f4d..74b05dc91e 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) |