From 975d1a978acda300b9c0e674354130722774f6ac Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Tue, 7 Oct 2025 13:29:18 +0100
Subject: [PATCH 1/2] [3.10] gh-139436: Remove ``dist-pdf`` from the docs
 archives rebuild target (GH-139437) (cherry picked from commit
 0e2cdd313ba5c67c5e2e21d993399b890e687c63)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---
 Doc/Makefile | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Doc/Makefile b/Doc/Makefile
index 4188f88d046d21..4039fc82a05fa0 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -155,10 +155,20 @@ venv:
 		echo "The venv has been created in the $(VENVDIR) directory"; \
 	fi
 
+.PHONY: dist-no-html
+dist-no-html: dist-text dist-epub dist-texinfo
+
 dist:
 	rm -rf dist
 	mkdir -p dist
-
+	$(MAKE) dist-html
+	$(MAKE) dist-text
+	$(MAKE) dist-pdf
+	$(MAKE) dist-epub
+	$(MAKE) dist-texinfo
+
+.PHONY: dist-html
+dist-html:
 	# archive the HTML
 	make html
 	cp -pPR build/html dist/python-$(DISTVERSION)-docs-html
@@ -168,6 +178,8 @@ dist:
 	rm -r dist/python-$(DISTVERSION)-docs-html
 	rm dist/python-$(DISTVERSION)-docs-html.tar
 
+.PHONY: dist-text
+dist-text:
 	# archive the text build
 	make text
 	cp -pPR build/text dist/python-$(DISTVERSION)-docs-text
@@ -177,6 +189,8 @@ dist:
 	rm -r dist/python-$(DISTVERSION)-docs-text
 	rm dist/python-$(DISTVERSION)-docs-text.tar
 
+.PHONY: dist-pdf
+dist-pdf:
 	# archive the A4 latex
 	rm -rf build/latex
 	make latex PAPER=a4
@@ -193,11 +207,15 @@ dist:
 	cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-letter.zip
 	cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-letter.tar.bz2
 
+.PHONY: dist-epub
+dist-epub:
 	# copy the epub build
 	rm -rf build/epub
 	make epub
 	cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
 
+.PHONY: dist-texinfo
+dist-texinfo:
 	# archive the texinfo build
 	rm -rf build/texinfo
 	make texinfo

From 9549bb69364c9b3d3c8c4cdfaf47b012f769819a Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Tue, 21 Oct 2025 12:01:01 +0100
Subject: [PATCH 2/2] fixup! Remove ``dist-pdf`` from the docs archives rebuild
 target

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

diff --git a/Doc/Makefile b/Doc/Makefile
index 4039fc82a05fa0..9e72b31ab492a2 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -243,11 +243,11 @@ serve:
 
 # for development releases: always build
 autobuild-dev:
-	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1'
+	make dist-no-html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1'
 
 # for quick rebuilds (HTML only)
 autobuild-dev-html:
-	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1'
+	make dist-html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=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