diff options
author | Toon Claes <toon@gitlab.com> | 2022-03-28 14:41:06 +0300 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2022-03-30 12:46:39 +0300 |
commit | 92947a5889861b939688fbf1642c3ebc3019d66c (patch) | |
tree | 302fa617ea77b5552769f1c430ca0e0df74de424 | |
parent | 91599682846d6466fa2e2a62839656012b97ab56 (diff) |
Makefile: Copy only Gitaly commands in install
In the `install` target all binaries found in _build/bin were installed.
At the same time, the `install-bundled-git` target is a prerequisite of
that `install` target. So this would cause the bundled Git binaries to
be copied twice. That's not needed, so instead only copy the Gitaly
commands in the `install` target.
-rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -256,8 +256,6 @@ BENCHMARK_REPO := ${TEST_REPO_DIR}/benchmark.git # Find all commands. find_commands = $(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) -# Find all command binaries. -find_command_binaries = $(addprefix ${BUILD_DIR}/bin/, $(shell ls ${BUILD_DIR}/bin)) # Find all Go source files. find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -name ruby -o -name vendor -o -name testdata -o -name '_*' -o -path '*/proto/go/gitalypb' \) -prune -o -type f -name '*.go' -not -name '*.pb.go' -print | sort -u) @@ -340,7 +338,7 @@ endif ## Install Gitaly binaries. The target directory can be modified by setting PREFIX and DESTDIR. install: build ${Q}mkdir -p ${INSTALL_DEST_DIR} - install $(call find_command_binaries) ${INSTALL_DEST_DIR} + install $(addprefix ${BUILD_DIR}/bin/,$(call find_commands)) "${INSTALL_DEST_DIR}" .PHONY: build-bundled-git ## Build bundled Git binaries. |