mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Makefile: keep "git" when bindir is execdir
For some reason there still are people who use the old style layout to put everything in $(bindir). The previous commit breaks the install for them, because it tries to unconditionally remove git from execdir and cp/ln from bindir --- oops. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4ecbc17870
commit
6edd14968b
5
Makefile
5
Makefile
|
@ -1641,10 +1641,11 @@ ifneq (,$X)
|
|||
endif
|
||||
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
|
||||
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
|
||||
{ $(RM) "$$execdir/git$X" && \
|
||||
{ test "$$bindir/" = "$$execdir/" || \
|
||||
{ $(RM) "$$execdir/git$X" && \
|
||||
test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
|
||||
ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
|
||||
cp "$$bindir/git$X" "$$execdir/git$X"; } && \
|
||||
cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
|
||||
{ for p in $(BUILT_INS); do \
|
||||
$(RM) "$$execdir/$$p" && \
|
||||
ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
|
||||
|
|
Loading…
Reference in a new issue