Do not try to remove directories when removing old links

When building Git with MSVC on Windows, directories named after the Git
alias are created for the output files, e.g. there is a
"git-merge-index" directory next to the "git-merge-index.exe" executable
in the build root. Previously, "make all" just checked if
"git-merge-index" and "git-merge-index.exe" are the same file, and if
not, tried to remove "git-merge-index". This fails in the case of
"git-merge-index" being a directory, which is why this is checked now.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Sebastian Schuberth
2009-10-27 12:13:05 +01:00
committed by Johannes Schindelin
parent 7e9e93bc67
commit 1abf3a5436

View File

@@ -1378,7 +1378,7 @@ SHELL = $(SHELL_PATH)
all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
ifneq (,$X)
$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';)
endif
all::