Skip to content

Commit

Permalink
Use $(MAKE) instead of raw "make" (ansible#39588)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
grimreaper authored and ansibot committed May 25, 2018
1 parent 67493eb commit 7847b14
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -391,7 +391,7 @@ generate_rst: lib/ansible/cli/*.py


docs: generate_rst
make $(MANPAGES)
$(MAKE) $(MANPAGES)

.PHONY: alldocs
alldocs: docs webdocs
Expand Down
2 changes: 1 addition & 1 deletion docs/docsite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7847b14

Please sign in to comment.