Makefile: remove the check_bindir script

This script was added in f28ac70f48 (Move all dashed-form commands to
libexecdir, 2007-11-28) when commands such as "git-add" lived in the
bin directory, instead of the git exec directory.

This notice helped someone incorrectly installing version v1.6.0 and
later into a directory built for a pre-v1.6.0 git version.

We're now long past the point where anyone who'd be helped by this
warning is likely to be doing that, so let's just remove this check
and warning to simplify the Makefile.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 9573190f1d7e0360c11c597532504cb29758cbec..d0324f458810af5a519c5f3ddf07baf594a23250 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3090,8 +3090,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

diff --git a/check_bindir b/check_bindir
deleted file mode 100755 (executable)
index 623eadc..0000000
--- a/check_bindir
+++ /dev/null
@@ -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