OSDN Git Service

Merge branch 'mp/make-cleanse-x-for-exe'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:17 +0000 (22:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:17 +0000 (22:42 -0800)
* mp/make-cleanse-x-for-exe:
  Explicitly set X to avoid potential build breakage

1  2 
Makefile

diff --cc Makefile
+++ b/Makefile
@@@ -458,8 -427,10 +458,11 @@@ PROGRAM_OBJS += show-index.
  PROGRAM_OBJS += upload-pack.o
  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