From: Alex Riesen Date: Thu, 28 Aug 2008 13:57:32 +0000 (+0200) Subject: Fix use of hardlinks in "make install" X-Git-Tag: v1.6.0.2~41^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e3ae59ef63475411f4c073ba3a1478b1ef73b9a;p=git.git Fix use of hardlinks in "make install" The code failed to filter-out git-add properly on platforms were $X is not empty (ATM there is only one such a platform). Than it tried to create a hardlink to the file ($execdir/git-add) it just removed (because git-add is first in the BUILT_INS), so ln failed (but because stderr was redirected into /dev/null the error was never seen), and the whole install ended up using "ln -s" instead. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 588bf5aee..b6df1e9d8 100644 --- a/Makefile +++ b/Makefile @@ -1370,7 +1370,7 @@ endif { $(RM) "$$execdir/git-add$X" && \ ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \ cp git-add$X "$$execdir/git-add$X"; } && \ - { $(foreach p,$(filter-out git-add,$(BUILT_INS)), $(RM) "$$execdir/$p" && \ + { $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \ ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \ ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \ cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \