From 65fef352051cce660d2eb22490da8b0978115d24 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nas@arctrix.com>
Date: Tue, 2 Mar 2021 18:02:08 -0800
Subject: [PATCH 1/2] Run regen-stdlib-module-names from regen-all.

---
 .github/workflows/build.yml | 1 -
 .travis.yml                 | 1 -
 Makefile.pre.in             | 5 +++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c674c5d606c546..c1461f943b0c86 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,7 +63,6 @@ jobs:
           # Build Python with the libpython dynamic library
           ./configure --with-pydebug --enable-shared
           make -j4 regen-all
-          make regen-stdlib-module-names
       - name: Check for changes
         run: |
           changes=$(git status --porcelain)
diff --git a/.travis.yml b/.travis.yml
index 6a22d20455b422..547d919974957c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -172,7 +172,6 @@ before_script:
   - eval "$(pyenv init -)"
   - pyenv global 3.8
   - PYTHON_FOR_REGEN=python3.8 make -j4 regen-all
-  - make regen-stdlib-module-names
   - changes=`git status --porcelain`
   - |
       # Check for changes in regenerated files
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 0f59700952989e..79b963d473e989 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -761,9 +761,10 @@ regen-limited-abi: all
 
 regen-all: regen-opcode regen-opcode-targets regen-typeslots \
 	regen-token regen-ast regen-keyword regen-importlib clinic \
-	regen-pegen-metaparser regen-pegen regen-frozen
+	regen-pegen-metaparser regen-pegen regen-frozen \
+	regen-stdlib-module-names
 	@echo
-	@echo "Note: make regen-stdlib-module-names and autoconf should be run manually"
+	@echo "Note: autoconf should be run manually"
 
 ############################################################################
 # Special rules for object files

From a2ca8a2179138328b5c8fbd6cb97e9a7990b76e2 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nas@arctrix.com>
Date: Tue, 2 Mar 2021 23:12:10 -0800
Subject: [PATCH 2/2] Add NEWS.

---
 Misc/NEWS.d/next/Build/2021-03-02-23-11-58.bpo-43384.IZE9y8.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Build/2021-03-02-23-11-58.bpo-43384.IZE9y8.rst

diff --git a/Misc/NEWS.d/next/Build/2021-03-02-23-11-58.bpo-43384.IZE9y8.rst b/Misc/NEWS.d/next/Build/2021-03-02-23-11-58.bpo-43384.IZE9y8.rst
new file mode 100644
index 00000000000000..25059efe7cc79c
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-03-02-23-11-58.bpo-43384.IZE9y8.rst
@@ -0,0 +1 @@
+Include "regen-stdlib-module-names" as part of "regen-all".