[PATCH] Allow installing in the traditional way
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 28, 2008, 07:09 UTC
- Message-ID
- <7vod4itrgg.fsf@gitster.siamese.dyndns.org>
In an earlier commit c70a8d9 (Makefile: Do not install a copy of 'git' in $(gitexecdir), 2008-07-21), we tried to avoid installing two git, one in /usr/bin/git and the other in /usr/libexec/git-core/git. It mistakenly removed the only copy of git when gitexecdir and bindir are set to the same directory, i.e. the traditional layout.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index 7e30b30..52c67c1 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:
-- 1.6.0.rc1