Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mp/make-cleanse-x-for-exe'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Feb 2012 06:42:17 +0000
(22:42 -0800)
committer
Junio 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
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
8ed9f5d
ace5e97
)
diff --cc
Makefile
index 87fb30aedbdbbb0f403cbc985889cb079a29c7b4,6e70a6d44c7a9e0070f702987e796c71e4325690..c92c2ba24dd53e7dfbf90e50f5b59d0ff2545d92
---
1
/
Makefile
---
2
/
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