From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 7 May 2019 21:03:50 +0000 (-0400)
Subject: bpo-36838: Suggest 'make venv' when missing Doc/ tools. (GH-13173)
X-Git-Tag: v3.8.0b1~449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3918ad6b45da31e05265de5a455102276717c659;p=thirdparty%2FPython%2Fcpython.git

bpo-36838: Suggest 'make venv' when missing Doc/ tools. (GH-13173)
---

diff --git a/Doc/Makefile b/Doc/Makefile
index 53877e613290..cf1bb88b0b8e 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -48,11 +48,19 @@ build:
 	@if [ -f  ../Misc/NEWS ] ; then \
 		echo "Using existing Misc/NEWS file"; \
 		cp ../Misc/NEWS build/NEWS; \
-	elif [ -d ../Misc/NEWS.d ]; then \
-		echo "Building NEWS from Misc/NEWS.d with blurb"; \
-		$(BLURB) merge -f build/NEWS; \
+	elif $(BLURB) help >/dev/null 2>&1 && $(SPHINXBUILD) --version >/dev/null 2>&1; then \
+		if [ -d ../Misc/NEWS.d ]; then \
+			echo "Building NEWS from Misc/NEWS.d with blurb"; \
+			$(BLURB) merge -f build/NEWS; \
+		else \
+			echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \
+			exit 1; \
+		fi \
 	else \
-		echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \
+		echo ""; \
+		echo "Missing the required blurb or sphinx-build tools."; \
+		echo "Please run 'make venv' to install local copies."; \
+		echo ""; \
 		exit 1; \
 	fi
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)