Rename Setup.in to Setup.dist, and assume that configure will create

Setup (instead of creating it from the Makefile).

diff --git a/BeOS/README b/BeOS/README
index ab71bd9bb415571b84e90a190f2b81cc65039754..90013ee20884b780d814979364a8f84db5b4e7e8 100644 (file)
--- a/BeOS/README
+++ b/BeOS/README
@@ -29,8 +29,7 @@ To build,
 
    1)  ./configure --prefix=/boot/home/config
 
-   2)  cp Modules/Setup.in Modules/Setup
-       edit Modules/Setup
+   2)  edit Modules/Setup
           comment out grp and mmap, and pwd on 4.5 or earlier
           uncomment any modules you want to include in python
           (you can also add them later as shared libraries.)

diff --git a/Misc/AIX-NOTES b/Misc/AIX-NOTES
index 6050dd48f26e80a7e04d5600e9541a54e4a4b428..c532facbc6d611b720aa066db3b2e4bfe14ca51e 100644 (file)
--- a/Misc/AIX-NOTES
+++ b/Misc/AIX-NOTES
@@ -88,7 +88,7 @@ AIX shared library support was added to Python in the 1.4 release by Manus
 Hand (mhand@csn.net) and Vladimir Marangozov (Vladimir.Marangozov@imag.fr).
 
 Python modules may now be built as shared libraries on AIX using the normal
-process of uncommenting the "*shared*" line in Modules/Setup.in before the
+process of uncommenting the "*shared*" line in Modules/Setup before the
 build.
 
 AIX shared libraries require that an "export" and "import" file be provided

diff --git a/Misc/Makefile.pre.in b/Misc/Makefile.pre.in
index ca68576a84dd8317282530f10c9fb19451e38d18..1cc91a17643ec3d899ad8fe9cbcd8f6093b302a4 100644 (file)
--- a/Misc/Makefile.pre.in
+++ b/Misc/Makefile.pre.in
@@ -17,7 +17,7 @@
 # only withs with Python 1.5, alpha 3 or newer.)
 
 # Create a file Setup.in for your extension.  This file follows the
-# format of the Modules/Setup.in file; see the instructions there.
+# format of the Modules/Setup.dist file; see the instructions there.
 # For a simple module called "spam" on file "spammodule.c", it can
 # contain a single line:
 #   spam spammodule.c

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 670868603db0602870aed0fdb3d6e93e4000fd06..fa94956c31e9dd0ce3c5448578af80e1e994b554 100644 (file)
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -160,16 +160,12 @@ hassignal:
                    fi; \
                done
 
-Setup:         $(srcdir)/Setup.in
-               @if [ -f Setup ] ; then \
-                   echo; \
-                   echo "----------------------------------------------"; \
-                   echo "Modules/Setup.in is newer than Modules/Setup;"; \
-                   echo "check to make sure you have all the updates"; \
-                   echo "you need in your Setup file."; \
-                   echo "----------------------------------------------"; \
-                   echo; \
-               else (set -x; cp $(srcdir)/Setup.in Setup); fi
+Setup:         $(srcdir)/Setup.dist
+               echo "-----------------------------------------------"; \
+               echo "Modules/Setup.dist is newer than Modules/Setup;"; \
+               echo "check to make sure you have all the updates you"; \
+               echo "need in your Modules/Setup file."; \
+               echo "-----------------------------------------------";
 
 
 Setup.local:

diff --git a/Modules/Setup.in b/Modules/Setup.dist
similarity index 99%
rename from Modules/Setup.in
rename to Modules/Setup.dist
index ca83fabc37a5fab96bac167eeaeaef4a29902c3f..d4be06b2dbad1b8f0945271fdda8d043b3f52e68 100644 (file)
--- a/Modules/Setup.in
+++ b/Modules/Setup.dist
@@ -2,12 +2,12 @@
 # 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.in; once it exists it will not be overwritten, so you can edit
+# 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.
 
 # (VPATH notes: Setup and Makefile.pre are in the build directory, as
-# are Makefile and config.c; the *.in files are in the source
+# are Makefile and config.c; the *.in and *.dist files are in the source
 # directory.)
 
 # Each line in this file describes one or more optional modules.

diff --git a/Modules/makesetup b/Modules/makesetup
index 0a2794e0718adcfda785bb0f342935cdbd1a03fa..09ab50cf46cc440f92ed3f2df38afcf684ef5215 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -16,7 +16,7 @@
 # Setup files after a -n option are used for their variables, modules
 # and libraries but not for their .o files.
 #
-# See Setup.in for a description of the format of the Setup file.
+# See Setup.dist for a description of the format of the Setup file.
 #
 # The following edits are made:
 #