diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-05-15 09:02:49 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-05-15 09:02:49 +0300 |
| commit | 290b75aca15308d950f1db4b3c190df6bcf72cad (patch) | |
| tree | 466522c0563337f1f73be9e9f4a5e35fe9ebb53a | |
| parent | 0048fc5549942d6cbe08fbf1630f084b356b48db (diff) | |
| parent | 1cbea5773281f614418c9ea2c64f303fd82b42c4 (diff) | |
Merge branch 'jc-support-bindir-in-makefile' into 'master'
Support bindir in Makefile
Closes gitlab#213467
See merge request gitlab-org/gitaly!2167
| -rw-r--r-- | _support/Makefile.template | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/_support/Makefile.template b/_support/Makefile.template index c9f6e2339..adfe5f192 100644 --- a/_support/Makefile.template +++ b/_support/Makefile.template @@ -7,7 +7,10 @@ # These variables may be overridden at runtime by top-level make PREFIX ?= /usr/local -INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ +prefix ?= $(PREFIX) +exec_prefix ?= $(prefix) +bindir ?= $(exec_prefix)/bin +INSTALL_DEST_DIR := $(DESTDIR)$(bindir) BUNDLE_FLAGS ?= {{ .BundleFlags }} ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver |