diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-28 07:05:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-28 20:09:54 (GMT) |
| commit | 1b65f38c06e277a13fd7bf77d3d70df604912c08 (patch) | |
| tree | 7e0be304001e215c07629b5d02a96ff9558d33e2 /Makefile | |
| parent | e84a063da86cbf4382fbfb6f85e75c2ca2a8b9c7 (diff) | |
| download | git-1b65f38c06e277a13fd7bf77d3d70df604912c08.zip git-1b65f38c06e277a13fd7bf77d3d70df604912c08.tar.gz git-1b65f38c06e277a13fd7bf77d3d70df604912c08.tar.bz2 | |
Allow installing in the traditional way
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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: |