Commit a22e410e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'install-p' into 'master'

make: add INSTALL variable

See merge request gitlab-org/gitlab-workhorse!217
parents 70ca94d0 78387988
...@@ -9,6 +9,7 @@ COVERAGE_DIR := $(TARGET_DIR)/cover ...@@ -9,6 +9,7 @@ COVERAGE_DIR := $(TARGET_DIR)/cover
VERSION := $(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) VERSION := $(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
GOBUILD := go build -ldflags "-X main.Version=$(VERSION)" GOBUILD := go build -ldflags "-X main.Version=$(VERSION)"
EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
INSTALL := install
MINIMUM_SUPPORTED_GO_VERSION := 1.8 MINIMUM_SUPPORTED_GO_VERSION := 1.8
...@@ -57,7 +58,7 @@ gitlab-workhorse: $(TARGET_SETUP) $(shell find . -name '*.go' | grep -v '^\./_') ...@@ -57,7 +58,7 @@ gitlab-workhorse: $(TARGET_SETUP) $(shell find . -name '*.go' | grep -v '^\./_')
install: gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata install: gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata
$(call message,$@) $(call message,$@)
mkdir -p $(DESTDIR)$(PREFIX)/bin/ mkdir -p $(DESTDIR)$(PREFIX)/bin/
cd $(BUILD_DIR) && install gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata $(DESTDIR)$(PREFIX)/bin/ cd $(BUILD_DIR) && $(INSTALL) gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata $(DESTDIR)$(PREFIX)/bin/
.PHONY: test .PHONY: test
test: $(TARGET_SETUP) prepare-tests test: $(TARGET_SETUP) prepare-tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment