summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Palimaka <kensington@astralcloak.net>2012-02-08 21:59:04 +1100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-09 14:31:48 -0800
commitace5e97ecdf6a6ad8fd4ba443486fbe0058eb37a (patch)
tree845ff911b2b0f128b722abdf91e8322588b92d90
parentSync with 1.7.6.6 (diff)
downloadtgif-ace5e97ecdf6a6ad8fd4ba443486fbe0058eb37a.tar.xz
Explicitly set X to avoid potential build breakage
$X is appended to binary names for Windows builds (ie. git.exe). Pollution from the environment can inadvertently trigger this behaviour, resulting in 'git' turning into 'gitwhatever' without warning. Signed-off-by: Michael Palimaka <kensington@astralcloak.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b21d2f1417..6e70a6d44c 100644
--- a/Makefile
+++ b/Makefile
@@ -428,6 +428,9 @@ PROGRAM_OBJS += upload-pack.o
PROGRAM_OBJS += http-backend.o
PROGRAM_OBJS += sh-i18n--envsubst.o
+# Binary suffix, set to .exe for Windows builds
+X =
+
PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
TEST_PROGRAMS_NEED_X += test-chmtime