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

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

diff --git a/Makefile b/Makefile
index b5530cbaae9833ad096998b55888851b589fa690..4ff3faa4721a269d1649dac6528c1645b46a9681 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -452,6 +452,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