summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-02-19 20:13:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-20 00:55:38 (GMT)
commita348ab702a84983c258e4961a58b1b9502f428c8 (patch)
treed293178a9fd51c5173e0834b028398d701626ff2
parent2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc (diff)
downloadgit-a348ab702a84983c258e4961a58b1b9502f428c8.zip
git-a348ab702a84983c258e4961a58b1b9502f428c8.tar.gz
git-a348ab702a84983c258e4961a58b1b9502f428c8.tar.bz2
Really honour NO_PYTHON
Do not even test for subprocess (trying to execute python). Signed-off-by: Johannes E. Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 080651e..d5a95c4 100644
--- a/Makefile
+++ b/Makefile
@@ -291,8 +291,10 @@ endif
ifdef WITH_OWN_SUBPROCESS_PY
PYMODULES += compat/subprocess.py
else
- ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
- PYMODULES += compat/subprocess.py
+ ifeq ($(NO_PYTHON),)
+ ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
+ PYMODULES += compat/subprocess.py
+ endif
endif
endif