From 343d35c9166cf1713eb2787c3506fd2663466262 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Sep 2005 19:47:54 -0700 Subject: Ship our own copy of subprocess.py so people without the latest Python could run merge-recursive. Signed-off-by: Junio C Hamano --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 957fadc57c..f83c4951bc 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,8 @@ # # Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz). # +# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3. +# # Define COLLISION_CHECK below if you believe that SHA1's # 1461501637330902918203684832716283019655932542976 hashes do not give you # sufficient guarantee that no collisions between objects will ever happen. @@ -117,6 +119,10 @@ PROGRAMS += git-ssh-pull git-ssh-push PYMODULES = \ gitMergeCommon.py +ifdef WITH_OWN_SUBPROCESS_PY + PYMODULES += compat/subprocess.py +endif + ifdef WITH_SEND_EMAIL SCRIPT_PERL += git-send-email.perl endif -- cgit v1.2.3