[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5

[victor.stinner]

https://hg.python.org/cpython/rev/a218260334c4
changeset:   104533:a218260334c4
branch:      3.6
parent:      104530:2d352bf2b228
parent:      104532:87aced4a9cf5
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Oct 18 15:48:14 2016 +0200
summary:
  Merge 3.5

files:
  Doc/Makefile |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -162,12 +162,12 @@
 
 # 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

-- 
Repository URL: https://hg.python.org/cpython