diff options
| author | Ned Deily <nad@python.org> | 2017-11-27 22:07:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 22:07:32 (GMT) |
| commit | 122fc136b34e11906466851e77bb6959946467ee (patch) | |
| tree | 052d637fb28a791abd42cead7626c7f4485a54dc /Doc/Makefile | |
| parent | 9522a218f7dff95c490ff359cc60e8c2af35f5c8 (diff) | |
| download | cpython-122fc136b34e11906466851e77bb6959946467ee.zip cpython-122fc136b34e11906466851e77bb6959946467ee.tar.gz cpython-122fc136b34e11906466851e77bb6959946467ee.tar.bz2 | |
Revert "bpo-30487: automatically create a venv and install Sphinx when running make (GH-4346)" (#4592)
Fix breakage documented in bpo-32149.
This reverts commit d8d6b9122134f040cd5a4f15f40f6c9e3386db4d.
Diffstat (limited to 'Doc/Makefile')
| -rw-r--r-- | Doc/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 69e7e2e..307d1e0 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -17,7 +17,7 @@ ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PA .PHONY: help build html htmlhelp latex text changes linkcheck \ suspicious coverage doctest pydoc-topics htmlview clean dist check serve \ - autobuild-dev autobuild-stable + autobuild-dev autobuild-stable venv help: @echo "Please use \`make <target>' where <target> is one of" @@ -39,7 +39,7 @@ help: @echo " check to run a check for frequent markup errors" @echo " serve to serve the documentation on the localhost (8000)" -build: venv +build: -mkdir -p build # Look first for a Misc/NEWS file (building from a source release tarball # or old repo) and use that, otherwise look for a Misc/NEWS.d directory @@ -122,11 +122,9 @@ clean: -rm -rf build/* $(VENVDIR)/* venv: - @if [ "$(SPHINXBUILD)" == "PATH=$(VENVDIR)/bin:$$PATH sphinx-build" ]; then \ - $(PYTHON) -m venv $(VENVDIR); \ - echo "A virtual environment for Docs has been made in the $(VENVDIR) directory"; \ - $(VENVDIR)/bin/python3 -m pip install Sphinx blurb; \ - fi + $(PYTHON) -m venv $(VENVDIR) + $(VENVDIR)/bin/python3 -m pip install -U Sphinx blurb + @echo "The venv has been created in the $(VENVDIR) directory" dist: rm -rf dist |