Gitaly binaries looked for in wrong location

Summary and Steps to Reproduce

This might be a configuration issue, but the problem didn't exist prior to Gitaly v1.67.0, so might be a regression as well.

I've got the following in gitlab/config/gitlab.yml:

  gitaly:
    # Path to the directory containing Gitaly client executables.
    client_path: /usr/local/bin

I'm building and installing Gitaly like so:

cd /.../gitaly
make all
make install
rm -rf _build

This installs binaries such as gitaly, gitaly-debug, gitaly-hooks etc into /usr/local/bin/.

When pushing, however, I get the following error:

remote: /.../gitaly/ruby/git-hooks/pre-receive: line 5: exec: /usr/local/bin/gitaly/gitaly-hooks: cannot execute: Not a directory

Apparently, the Gitaly binaries are expected to be found in /usr/local/bin/gitaly/ instead.

Results of GitLab environment info

I've ##blanked## some irrelevant details which must not become public knowledge!

System information
System:		Gentoo
Current User:	gitlab
Using RVM:	no
Ruby Version:	2.6.4p104
Gem Version:	3.0.3
Bundler Version:1.17.2
Rake Version:	12.3.3
Redis Version:	4.0.14
Git Version:	2.23.0
Sidekiq Version:5.2.7
Go Version:	go1.12.9 linux/amd64

GitLab information
Version:	12.4.2
Revision:	393a5bdafa2
Directory:	/#####/source/gitlab
DB Adapter:	PostgreSQL
DB Version:	11.4
URL:		https://gitlab.bitcetera.com
HTTP Clone URL:	https://gitlab.bitcetera.com/some-group/some-project.git
SSH Clone URL:	ssh://gitlab@gitlab.bitcetera.com:####/some-group/some-project.git
Using LDAP:	no
Using Omniauth:	no

GitLab Shell
Version:	10.2.0
Repository storage paths:
- default: 	/#####/repositories
GitLab Shell path:		/#####/source/gitlab-shell
Git:		/usr/bin/git

Results of GitLab Application Check

all green

Edited Nov 14, 2019 by Sven Schwyn
Assignee Loading
Time tracking Loading