Andrew's git / gitweb.git / diff
?
Makefile: building git in cygwin 1.7.0
authorEric Blake <ebb9@byu.net>
Fri, 15 Aug 2008 15:01:03 +0000 (15:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 Aug 2008 09:34:23 +0000 (02:34 -0700)
On platforms with $X, make removes any leftover scripts 'a' from
earlier builds if a new binary 'a.exe' is now built. However, on
cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file.
Test for file equality before attempting a remove, in order to avoid
nuking just-built binaries.

Signed-off-by: Eric Blake <ebb9@byu.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 90c5a131be24463183a1f21cf3bf337ef00dd67c..53ab4b55369652ecbcbd7b2655a9dfc6aeb08336 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1064,7 +1064,7 @@ SHELL = $(SHELL_PATH)
 
 all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
 ifneq (,$X)
 
 all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
 ifneq (,$X)
-       $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$p';)
+       $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
 endif
 
 all::
 endif
 
 all::