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>
Junio C Hamano committed
Jul 28, 2008 at 00:05 UTC
1b65f38c06e277a13fd7bf77d3d70df604912c08
1 file changed
+4
-1
Makefile
+4
-1
@@ -1362,7 +1362,10 @@ endif
1362
cp "$$bindir/git$X" "$$execdir/git$X"; \
1363
fi && \
1364
{ $(foreach p,$(BUILT_INS), $(RM) "$$execdir/$p" && ln "$$execdir/git$X" "$$execdir/$p" ;) } && \
1365
- $(RM) "$$execdir/git$X" && \
1365
+ if test "z$$bindir" != "z$$execdir"; \
1366
+ then \
1367
+ $(RM) "$$execdir/git$X"; \
1368
+ fi && \
1369
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
1370
1371
install-doc: