diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-10-18 13:48:14 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-10-18 13:48:14 (GMT) |
| commit | 33bb64fb307c46279197f4eac3d5cb1b8f764ccd (patch) | |
| tree | 52d35de2f217747242be658cb5451108116ff40d | |
| parent | df0fd74ae8fa204aab51c35e10870fd99101e99c (diff) | |
| parent | 9f2e377beb4731c770f1383f2bae92fe1b8cc2e2 (diff) | |
| download | cpython-33bb64fb307c46279197f4eac3d5cb1b8f764ccd.zip cpython-33bb64fb307c46279197f4eac3d5cb1b8f764ccd.tar.gz cpython-33bb64fb307c46279197f4eac3d5cb1b8f764ccd.tar.bz2 | |
Merge 3.5
| -rw-r--r-- | Doc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 202e8e1..91f937f 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -162,12 +162,12 @@ serve: # for development releases: always build autobuild-dev: - make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1' + make dist SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1' -make suspicious # for quick rebuilds (HTML only) autobuild-dev-html: - make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' + make html SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1' # for stable releases: only build if not in pre-release stage (alpha, beta) # release candidate downloads are okay, since the stable tree can be in that stage |