cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use $(MAKE) instead of raw "make" (#39588)

Browse source 
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.
This commit is contained in:
Eitan Adler 2018-05-24 20:30:14 -07:00 committed by ansibot
parent 67493ebdee
commit 7847b1492c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -377,12 +377,12 @@ deb-src-upload: deb-src
.PHONY: epub .PHONY: epub
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 # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
.PHONY: webdocs .PHONY: webdocs
webdocs: webdocs:
(cd docs/docsite/; CPUS=$(CPUS) make docs) (cd docs/docsite/; CPUS=$(CPUS) $(MAKE) docs)
.PHONY: generate_rst .PHONY: generate_rst
generate_rst: lib/ansible/cli/*.py generate_rst: lib/ansible/cli/*.py
@ -391,7 +391,7 @@ generate_rst: lib/ansible/cli/*.py
docs: generate_rst docs: generate_rst
make $(MANPAGES) $(MAKE) $(MANPAGES)
.PHONY: alldocs .PHONY: alldocs
alldocs: docs webdocs alldocs: docs webdocs

2
docs/docsite/Makefile
View file

@ -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 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: epub:
(CPUS=$(CPUS) make -f Makefile.sphinx epub) (CPUS=$(CPUS) $(MAKE) -f Makefile.sphinx epub)
htmlsingle: assertrst htmlsingle: assertrst
sphinx-build -j $(CPUS) -b html -d $(BUILDDIR)/doctrees ./rst $(BUILDDIR)/html rst/$(rst) sphinx-build -j $(CPUS) -b html -d $(BUILDDIR)/doctrees ./rst $(BUILDDIR)/html rst/$(rst)