* [PATCH] Allow installing in the traditional way
@ 2008-07-28 7:09 Junio C Hamano
2008-07-28 20:00 ` Johannes Sixt
0 siblings, 1 reply; 2+ messages in thread
From: Junio C Hamano @ 2008-07-28 7:09 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Allow installing in the traditional way
2008-07-28 7:09 [PATCH] Allow installing in the traditional way Junio C Hamano
@ 2008-07-28 20:00 ` Johannes Sixt
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Sixt @ 2008-07-28 20:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Zitat von Junio C Hamano <gitster@pobox.com>:
> 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.
The patch looks fine. Thanks for fixing up my mistakes.
-- Hannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-07-28 20:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-28 7:09 [PATCH] Allow installing in the traditional way Junio C Hamano
2008-07-28 20:00 ` Johannes Sixt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).