mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ab/no-more-check-bindir'
Build simplification. * ab/no-more-check-bindir: Makefile: remove the check_bindir script
This commit is contained in:
commit
59a29d1644
3
Makefile
3
Makefile
|
@ -3099,8 +3099,7 @@ endif
|
|||
ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
|
||||
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
|
||||
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; } \
|
||||
done && \
|
||||
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
|
||||
done
|
||||
|
||||
.PHONY: install-gitweb install-doc install-man install-man-perl install-html install-info install-pdf
|
||||
.PHONY: quick-install-doc quick-install-man quick-install-html
|
||||
|
|
13
check_bindir
13
check_bindir
|
@ -1,13 +0,0 @@
|
|||
#!/bin/sh
|
||||
bindir="$1"
|
||||
gitexecdir="$2"
|
||||
gitcmd="$3"
|
||||
if test "$bindir" != "$gitexecdir" && test -x "$gitcmd"
|
||||
then
|
||||
echo
|
||||
echo "!! You have installed git-* commands to new gitexecdir."
|
||||
echo "!! Old version git-* commands still remain in bindir."
|
||||
echo "!! Mixing two versions of Git will lead to problems."
|
||||
echo "!! Please remove old version commands in bindir now."
|
||||
echo
|
||||
fi
|
Loading…
Reference in a new issue