X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=69b9ea1ab087431a131976c0040cf508bdff4e60;hb=1a9366c0d48dbac3f728a1c6ff0da0fb7fd95353;hp=45ce4221c9db032877f6f9259b35ffc07d2d6581;hpb=9121a1a1a0981a54fa53a66a3f77e09e88355b67;p=git.git

diff --git a/Makefile b/Makefile
index 45ce4221..69b9ea1a 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,8 @@ all:
 # Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
 # a missing newline at the end of the file.
 #
+# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
+#
 # 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.
@@ -442,6 +444,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 	sed -e '1s|#!.*/sh|#!$(call shq,$(SHELL_PATH))|' \
 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
+	    -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
 	    $@.sh >$@
 	chmod +x $@
 
@@ -521,6 +524,12 @@ doc:
 
 ### Testing rules
 
+# GNU make supports exporting all variables by "export" without parameters.
+# However, the environment gets quite big, and some programs have problems
+# with that.
+
+export NO_PYTHON
+
 test: all
 	$(MAKE) -C t/ all