[Python-checkins] cpython (merge 3.4 -> 3.5): merge with 3.4

Wed Jun 15 02:59:40 EDT 2016

https://hg.python.org/cpython/rev/1e7072d53b84
changeset: 102049:1e7072d53b84
branch: 3.5
parent: 102045:32af78a8b88f
parent: 102048:dfc57c66a670
user: Georg Brandl <georg at python.org>
date: Wed Jun 15 08:58:00 2016 +0200
summary:
 merge with 3.4
files:
 Doc/Makefile | 9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -166,7 +166,7 @@
 	-make suspicious
 
 # for quick rebuilds (HTML only)
-autobuild-html:
+autobuild-dev-html:
 	make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
@@ -177,3 +177,10 @@
 		exit 1;; \
 	esac
 	@make autobuild-dev
+
+autobuild-stable-html:
+	@case $(DISTVERSION) in *[ab]*) \
+		echo "Not building; $(DISTVERSION) is not a release version."; \
+		exit 1;; \
+	esac
+	@make autobuild-dev-html
-- 
Repository URL: https://hg.python.org/cpython
