diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-20 06:47:54 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 06:47:54 +0400 |
| commit | 343d35c9166cf1713eb2787c3506fd2663466262 (patch) | |
| tree | bed6058fd6ea00ac10528621ea5ac3788e1f4da1 /Makefile | |
| parent | 0a2ba73860211efec479396c33ba381056715be5 (diff) | |
Ship our own copy of subprocess.py
so people without the latest Python could run merge-recursive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |