diff options
| author | Toon Claes <toon@gitlab.com> | 2021-05-25 16:29:56 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-05-25 16:29:56 +0300 |
| commit | 6efcbcba9029a0a16ec30c0b92155d50596503ac (patch) | |
| tree | d9239d6e0b8c676de06ad7ba2e940db663632671 | |
| parent | 395f7c52943f9d2d101bcc2265373b2671ca0321 (diff) | |
| parent | cb42b08813fddb3f92aed6afde5246a1a19781b0 (diff) | |
Merge branch 'smh-fix-gitaly-path' into 'master'
Revert "Makefile: Stop installing binaries into source dir"
Closes gitlab#331758
See merge request gitlab-org/gitaly!3538
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 8e0817d8f..1d71a918c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,15 @@ +# Top-level executables +/gitaly +/gitaly-backup +/gitaly-blackbox +/gitaly-debug +/gitaly-git2go +/gitaly-hooks +/gitaly-lfs-smudge +/gitaly-ssh +/gitaly-wrapper +/praefect + # Generic artifacts /_build/ /*.deb @@ -188,7 +188,8 @@ export CGO_LDFLAGS_ALLOW = -D_THREAD_SAFE .SECONDARY: .PHONY: all -all: build +all: INSTALL_DEST_DIR = ${SOURCE_DIR} +all: install .PHONY: build build: ${SOURCE_DIR}/.ruby-bundle libgit2 @@ -281,7 +282,7 @@ notice: ${SOURCE_DIR}/NOTICE .PHONY: clean clean: - rm -rf ${BUILD_DIR} ${SOURCE_DIR}/internal/testhelper/testdata/data/ ${SOURCE_DIR}/ruby/.bundle/ ${SOURCE_DIR}/ruby/vendor/bundle/ + rm -rf ${BUILD_DIR} ${SOURCE_DIR}/internal/testhelper/testdata/data/ ${SOURCE_DIR}/ruby/.bundle/ ${SOURCE_DIR}/ruby/vendor/bundle/ $(addprefix ${SOURCE_DIR}/, $(notdir $(call find_commands))) .PHONY: clean-ruby-vendor-go clean-ruby-vendor-go: |