summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-14 07:26:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-14 07:26:25 (GMT)
commit1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb (patch)
treebb269b54dd2e2e1b6e9250355330defb0ae4e383 /Makefile
parent42e283a1bfd0651fd2e6264157ecbe8841511788 (diff)
parentace5e97ecdf6a6ad8fd4ba443486fbe0058eb37a (diff)
downloadgit-1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb.zip
git-1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb.tar.gz
git-1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb.tar.bz2
Merge branch 'mp/make-cleanse-x-for-exe' into maint
* mp/make-cleanse-x-for-exe: Explicitly set X to avoid potential build breakage
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b5530cb..4ff3faa 100644
--- 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