From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sun, 19 Feb 2006 20:13:48 +0000 (+0100)
Subject: Really honour NO_PYTHON
X-Git-Tag: v1.3.0-rc1~166^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a348ab702a84983c258e4961a58b1b9502f428c8;p=git.git

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>
---

diff --git a/Makefile b/Makefile
index 080651e0..d5a95c41 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