X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=d6dad193044f96638e5f068a7a9332d1597af538;hb=e0a87193d3f2b78b7b687405c0315e1517d36912;hp=092931a1f1ab5874562a056ae8ba82afd69840aa;hpb=1b1e59c5084ac8b0af0aa443bb1713179d400211;p=git.git

diff --git a/Makefile b/Makefile
index 092931a1..d6dad193 100644
--- a/Makefile
+++ b/Makefile
@@ -133,11 +133,26 @@ PROGRAMS += git-ssh-pull$X git-ssh-push$X
 
 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 = \
 	gitMergeCommon.py
 
 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
+	endif
 endif
 
 ifdef WITH_SEND_EMAIL
@@ -252,16 +267,6 @@ ifndef NO_CURL
 	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
 	LIB_OBJS += epoch.o
 	OPENSSL_LIBSSL = -lssl