summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2017-01-13 14:12:51 -0500
committerAdrian Likins <alikins@redhat.com>2017-01-13 14:41:14 -0500
commitc0263b3020667f35ee64498febff5b986c28c82e (patch)
tree8ca61758eeb6cf9cce066b02d9ce5847e81c88a4 /Makefile
parent64692e7a8960979c98b9107668751c8dbecb8926 (diff)
downloadansible-c0263b3020667f35ee64498febff5b986c28c82e.tar.gz
Pass CPUS from top Makefile to docs Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d24477f66b..dc0af2290e 100644
--- a/Makefile
+++ b/Makefile
@@ -177,6 +177,7 @@ clean:
find . -type f -name '*.pyc' -delete
@echo "Cleaning up docsite"
$(MAKE) -C docs/docsite clean
+ $(MAKE) -C docs/api clean
python:
$(PYTHON) setup.py build
@@ -298,7 +299,7 @@ deb-src-upload: deb-src
# for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
webdocs:
- (cd docs/docsite/; make docs)
+ (cd docs/docsite/; CPUS=$(CPUS) make docs)
docs: $(MANPAGES)