undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY

Browse Source 
Also rearrange some path settings in the Makefile in the process.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Ryan Anderson 2005-11-21 00:11:22 -05:00 committed by Junio C Hamano
parent bd22c904a0
commit 3d32051f4f
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -133,11 +133,26 @@ PROGRAMS += git-ssh-pull$X git-ssh-push$X
GIT_LIST_TWEAK = GIT_LIST_TWEAK =
# Set paths to tools early so that they can be used for version tests.
ifndef SHELL_PATH
SHELL_PATH = /bin/sh
endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
ifndef PYTHON_PATH
PYTHON_PATH = /usr/bin/python
endif
PYMODULES = \ PYMODULES = \
gitMergeCommon.py gitMergeCommon.py
ifdef WITH_OWN_SUBPROCESS_PY ifdef WITH_OWN_SUBPROCESS_PY
PYMODULES += compat/subprocess.py PYMODULES += compat/subprocess.py
else
ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
PYMODULES += compat/subprocess.py
endif
endif endif
ifdef WITH_SEND_EMAIL ifdef WITH_SEND_EMAIL
@ -252,16 +267,6 @@ ifndef NO_CURL
endif endif
endif endif
ifndef SHELL_PATH
SHELL_PATH = /bin/sh
endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
ifndef PYTHON_PATH
PYTHON_PATH = /usr/bin/python
endif
ifndef NO_OPENSSL ifndef NO_OPENSSL
LIB_OBJS += epoch.o LIB_OBJS += epoch.o
OPENSSL_LIBSSL = -lssl OPENSSL_LIBSSL = -lssl