bpo-32430: Rename Modules/Setup.dist to Modules/Setup (GH-8229)
bpo-32430: Rename Modules/Setup.dist to Modules/Setup
Remove the necessity to copy the former manually to the latter when updating the local source tree.
diff --git a/Modules/Setup.dist b/Modules/Setup
similarity index 97%
rename from Modules/Setup.dist
rename to Modules/Setup
index da2404a..e791c8c 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup
@@ -1,14 +1,11 @@
# -*- makefile -*-
# The file Setup is used by the makesetup script to construct the files
# Makefile and config.c, from Makefile.pre and config.c.in,
-# respectively. The file Setup itself is initially copied from
-# Setup.dist; once it exists it will not be overwritten, so you can edit
-# Setup to your heart's content. Note that Makefile.pre is created
-# from Makefile.pre.in by the toplevel configure script.
+# respectively. Note that Makefile.pre is created from Makefile.pre.in
+# by the toplevel configure script.
# (VPATH notes: Setup and Makefile.pre are in the build directory, as
-# are Makefile and config.c; the *.in and *.dist files are in the source
-# directory.)
+# are Makefile and config.c; the *.in files are in the source directory.)
# Each line in this file describes one or more optional modules.
# Modules configured here will not be compiled by the setup.py script,
diff --git a/Modules/getpath.c b/Modules/getpath.c
index e6a3e8e..755298e 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -322,7 +322,7 @@
/* Check to see if argv[0] is in the build directory */
wcsncpy(prefix, calculate->argv0_path, MAXPATHLEN);
prefix[MAXPATHLEN] = L'\0';
- joinpath(prefix, L"Modules/Setup");
+ joinpath(prefix, L"Modules/Setup.local");
if (isfile(prefix)) {
/* Check VPATH to see if argv0_path is in the build directory. */
vpath = Py_DecodeLocale(VPATH, NULL);
diff --git a/Modules/makesetup b/Modules/makesetup
index 020b199..c7b0a60 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -17,7 +17,7 @@
# Setup files after a -n option are used for their variables, modules
# and libraries but not for their .o files.
#
-# See Setup.dist for a description of the format of the Setup file.
+# See Setup for a description of the format of the Setup file.
#
# The following edits are made:
#