diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-23 08:45:11 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-05-23 08:45:11 +0300 |
| commit | 316f0078fa88aa2f1991f197efb425c065d9c6df (patch) | |
| tree | 43c7edc43ad072e5bce5a5d5a3a38876915988e0 | |
| parent | 400932fe7d9ab6f8d0fc8ccef507742b866f9190 (diff) | |
Makefile: Fix install target using doubly-prefixed Gitaly paths
With 17f3bf27b (Makefile: Use pattern rules to build Go binaries,
2022-05-10), we have converted the `GITALY_EXECUTABLES` variable to
contain absolute paths instead of only the executables' basenames. The
`install` target was still trying to prefix these binaries though, which
ultimately led to a path which had the binary directory's prefix twice
and thus broke installation.
Fix this bug by not reapplying the prefix.
Changelog: fixed
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -287,7 +287,7 @@ build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES} ## Install Gitaly binaries. The target directory can be modified by setting PREFIX and DESTDIR. install: build ${Q}mkdir -p ${INSTALL_DEST_DIR} - install $(addprefix ${BUILD_DIR}/bin/,${GITALY_EXECUTABLES} gitaly-git2go-v14) "${INSTALL_DEST_DIR}" + install ${GITALY_EXECUTABLES} "${INSTALL_DEST_DIR}" .PHONY: build-bundled-git ## Build bundled Git binaries. |