diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-09-08 00:38:31 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2017-09-08 00:38:31 (GMT) |
| commit | 645c1e421348790d49eab863279a41cb2b6a007a (patch) | |
| tree | 85b922d835ad2ed6ff6cab70626d3e565ae85c94 /.gitignore | |
| parent | 9423f5d68874ff2e500cbe072c25f883cf754be8 (diff) | |
| download | cpython-645c1e421348790d49eab863279a41cb2b6a007a.zip cpython-645c1e421348790d49eab863279a41cb2b6a007a.tar.gz cpython-645c1e421348790d49eab863279a41cb2b6a007a.tar.bz2 | |
[3.6] bpo-31036: Allow sphinx and blurb to be found automatically (GH-3440) (#3441)
Rather than requiring the path to blurb and/or sphinx-build to be specified to the make rule, enhance the Doc/Makefile to look for each first in a virtual environment created by make venv and, if not found, look on the normal process PATH. This allows the Doc/Makefile to take advantage of an installed spinx-build or blurb and, thus, do the right thing most of the time. Also, make the directory for the venv be configurable and document the `make venv` target.
(cherry picked from commit 590665c399fc4aa3c4a9f8e7104d43a02e9f3a0c)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -18,6 +18,9 @@ .gdb_history Doc/build/ Doc/venv/ +Doc/.venv/ +Doc/env/ +Doc/.env/ Include/pydtrace_probes.h Lib/distutils/command/*.pdb Lib/lib2to3/*.pickle |