зеркало из https://github.com/microsoft/git.git
Merge branch 'rb/maint-python-path'
* rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD
This commit is contained in:
Коммит
4de113cdf5
1
Makefile
1
Makefile
|
@ -866,6 +866,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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/python
|
||||
#!/usr/bin/env python
|
||||
|
||||
## zip archive frontend for git-fast-import
|
||||
##
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#! /usr/bin/python
|
||||
#!/usr/bin/env python
|
||||
|
||||
""" hg-to-git.py - A Mercurial to GIT converter
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче