diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-10-23 16:21:08 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-10-23 16:21:08 +0300 |
| commit | 8bc90ffd599fe88aa1d9e1ed14417b992849beab (patch) | |
| tree | c6f3ecdb23d5f966d883fe68feac950ba449002a | |
| parent | 5df578e418b7eb76f65e24be3bb6e8ca634653fa (diff) | |
| parent | 4d41b617476ef7a3f7b914aeef07c28dccbcc431 (diff) | |
Merge branch 'support-gmake' into 'master'
Use $(MAKE) when re-invoking make
See merge request gitlab-org/gitaly!933
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | changelogs/unreleased/support-gmake.yml | 5 |
2 files changed, 18 insertions, 13 deletions
@@ -21,55 +21,55 @@ all: build .PHONY: build build: prepare-build - cd $(BUILD_DIR) && make install INSTALL_DEST_DIR=$(CURDIR) + cd $(BUILD_DIR) && $(MAKE) install INSTALL_DEST_DIR=$(CURDIR) .PHONY: install install: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: assemble assemble: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: binaries binaries: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: prepare-tests prepare-tests: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: test test: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: rspec rspec: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: verify verify: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: format format: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: cover cover: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: notice notice: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: race-go race-go: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: docker docker: prepare-build - cd $(BUILD_DIR) && make $@ + cd $(BUILD_DIR) && $(MAKE) $@ .PHONY: prepare-build prepare-build: $(BUILD_DIR)/.ok update-makefile diff --git a/changelogs/unreleased/support-gmake.yml b/changelogs/unreleased/support-gmake.yml new file mode 100644 index 000000000..5b1f09d79 --- /dev/null +++ b/changelogs/unreleased/support-gmake.yml @@ -0,0 +1,5 @@ +--- +title: Use $(MAKE) when re-invoking make +merge_request: 933 +author: +type: fixed |