From 7847b1492cc4b7b17c8c54d54f4935a6a2e73cc0 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Thu, 24 May 2018 20:30:14 -0700 Subject: [PATCH] Use $(MAKE) instead of raw "make" (#39588) This Makefile uses non-standard constructs. As such it can only be parsed by GNU make, which is often installed as 'gmake' instead of 'make'. Using $(MAKE) ensures the same version of make gets called that is used to execute the top level. --- Makefile | 6 +++--- docs/docsite/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2e37bfccb3..82798a788f 100644 --- a/Makefile +++ b/Makefile @@ -377,12 +377,12 @@ deb-src-upload: deb-src .PHONY: epub epub: - (cd docs/docsite/; CPUS=$(CPUS) make epub) + (cd docs/docsite/; CPUS=$(CPUS) $(MAKE) epub) # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory .PHONY: webdocs webdocs: - (cd docs/docsite/; CPUS=$(CPUS) make docs) + (cd docs/docsite/; CPUS=$(CPUS) $(MAKE) docs) .PHONY: generate_rst generate_rst: lib/ansible/cli/*.py @@ -391,7 +391,7 @@ generate_rst: lib/ansible/cli/*.py docs: generate_rst - make $(MANPAGES) + $(MAKE) $(MANPAGES) .PHONY: alldocs alldocs: docs webdocs diff --git a/docs/docsite/Makefile b/docs/docsite/Makefile index aafcdb0069..52d18e504b 100644 --- a/docs/docsite/Makefile +++ b/docs/docsite/Makefile @@ -108,7 +108,7 @@ staticmin: cat _themes/srtd/static/css/theme.css | sed -e 's/^[ ]*//g; s/[ ]*$$//g; s/\([:{;,]\) /\1/g; s/ {/{/g; s/\/\*.*\*\///g; /^$$/d' | sed -e :a -e '$$!N; s/\n\(.\)/\1/; ta' > _themes/srtd/static/css/theme.min.css epub: - (CPUS=$(CPUS) make -f Makefile.sphinx epub) + (CPUS=$(CPUS) $(MAKE) -f Makefile.sphinx epub) htmlsingle: assertrst sphinx-build -j $(CPUS) -b html -d $(BUILDDIR)/doctrees ./rst $(BUILDDIR)/html rst/$(rst)