Merge branch 'mp/make-cleanse-x-for-exe'

* mp/make-cleanse-x-for-exe:
Explicitly set X to avoid potential build breakage

diff --git a/Makefile b/Makefile
index 87fb30aedbdbbb0f403cbc985889cb079a29c7b4..c92c2ba24dd53e7dfbf90e50f5b59d0ff2545d92 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -460,6 +460,9 @@ PROGRAM_OBJS += http-backend.o
 PROGRAM_OBJS += sh-i18n--envsubst.o
 PROGRAM_OBJS += credential-store.o
 
+# Binary suffix, set to .exe for Windows builds
+X =
+
 PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 
 TEST_PROGRAMS_NEED_X += test-chmtime