[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 5075b0264d013a07184a97da6e3a80664171a1ec..04da82fea966f6a5396a305ac859f241bed118bf 100644 (file)
--- 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