From: Junio C Hamano Date: Mon, 28 Jul 2008 06:39:50 GMT Subject: Re: [PATCH 1/9] Makefile: Do not install a copy of 'git' in $(gitexecdir) Message-ID: <7v63qqv7ex.fsf@gitster.siamese.dyndns.org> In-Reply-To: <7vabg2v83o.fsf@gitster.siamese.dyndns.org> Junio C Hamano writes: >> This new action needs to be in a conditional to keep it from removing >> the ONLY git executable when bindir and execdir are the same dir. > > Heh, I love bug reports that come immediately after I tag the tip of > 'master' as -rc1. This should do, but to be very honest, I really hate the output from the foreach that precedes this section. Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 798a2f2..92df61c 100644 --- a/Makefile +++ b/Makefile @@ -1362,7 +1362,10 @@ endif cp "$$bindir/git$X" "$$execdir/git$X"; \ fi && \ { $(foreach p,$(BUILT_INS), $(RM) "$$execdir/$p" && ln "$$execdir/git$X" "$$execdir/$p" ;) } && \ - $(RM) "$$execdir/git$X" && \ + if test "z$$bindir" != "z$$execdir"; \ + then \ + $(RM) "$$execdir/git$X"; \ + fi && \ ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" install-doc: