From: Ned Deily <nad@python.org>
Date: Thu, 27 Jul 2017 19:50:04 +0000 (-0400)
Subject: [3.5] bpo-31036: use an existing Misc/NEWS rather than trying to use blurb (#2874)
X-Git-Tag: v3.5.4~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe7b60b80f5cb23f84a49f95ef6ce23521eed14;p=python

[3.5] bpo-31036: use an existing Misc/NEWS rather than trying to use blurb (#2874)

* bpo-31036: use an existing Misc/NEWS rather than trying to use blurb

* bpo-31036: avoid echoing comments

(cherry picked from commit 3de144890ad3bc50694368a1b33be6d7f3a780b3)
---

diff --git a/Doc/Makefile b/Doc/Makefile
index 5075b0264d..04da82fea9 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -40,7 +40,19 @@ help:
 
 build:
 	-mkdir -p build
-	$(BLURB) merge -f build/NEWS
+# Look first for a Misc/NEWS file (building from a source release tarball
+# or old repo) and use that, otherwise look for a Misc/NEWS.d directory
+# (building from a newer repo) and use blurb to generate the NEWS file.
+	@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; \
+	else \
+		echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \
+		exit 1; \
+	fi
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)
 	@echo