diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-15 23:15:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-15 23:15:25 +0300 |
| commit | 59a29d16440a4c660b0b388d5f6da65d41102b7c (patch) | |
| tree | 5beb52c49345cb88d55397e52dd3aa212808de6f | |
| parent | 10de757a09414a06739478c687ea6a24234c8ee8 (diff) | |
| parent | 72b113e5621febe5d5138f73e464a4962b3b7851 (diff) | |
Merge branch 'ab/no-more-check-bindir'
Build simplification.
* ab/no-more-check-bindir:
Makefile: remove the check_bindir script
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | check_bindir | 13 |
2 files changed, 1 insertions, 15 deletions
@@ -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 diff --git a/check_bindir b/check_bindir deleted file mode 100755 index 623eadcbb7..0000000000 --- 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 |