Skip to content

Commit

Permalink
Allow installing in the traditional way
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jul 28, 2008
1 parent e84a063 commit 1b65f38
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 1b65f38

Please sign in to comment.