summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2008-08-15 15:01:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-16 09:34:23 (GMT)
commit0d768f7c8f1b38ba14bbd5a2dfc4d56ae5eb4ad8 (patch)
treebb8aead84b7956b9d59f757780035ffef93b0e3d
parentcb3a160d604866331fdb0f5078face4ab2a4b49a (diff)
downloadgit-0d768f7c8f1b38ba14bbd5a2dfc4d56ae5eb4ad8.zip
git-0d768f7c8f1b38ba14bbd5a2dfc4d56ae5eb4ad8.tar.gz
git-0d768f7c8f1b38ba14bbd5a2dfc4d56ae5eb4ad8.tar.bz2
Makefile: building git in cygwin 1.7.0
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>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 90c5a13..53ab4b5 100644
--- 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)
- $(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::