different MPW notes
diff --git a/Mac/README b/Mac/README
index 13010f0..f11e343 100644
--- a/Mac/README
+++ b/Mac/README
@@ -1,13 +1,19 @@
BUILDING PYTHON 1.2 FOR THE MACINTOSH
*************************************
-Python can be built on the Mac using either THINK C 6.0 (or 7.0), MPW
-3.2, or CodeWarrior 5.0. In the past it has also been compiled with
-earlier versions of Think and MPW, but no guarantees are made that the
-source is still compatible with those versions. Think C 5.0 appears
-to be OK. Likewise, new compiler versions may effectively change the
+Python can be built on the Mac using either THINK C 6.0 (or 7.0), or
+CodeWarrior 5.0 (for 68K and PPC). In the past it has also been compiled
+with earlier versions of Think, but no guarantees are made that the
+source is still compatible with those versions. (Think C 5.0 appears
+to be OK.) Likewise, new compiler versions may effectively change the
language accepted (or the library provided!) and thus cause problems.
+MPW is a special case -- it used to be possible to build Python as
+an MPW tool using MPW 3.2, and this may still work, but I haven't
+tried this lately. What I have tried, however, is building Python
+as a shared library for CFM-68K, using the Symantec C compiler for MPW.
+See subdirectory MPW and the README file there for more info.
+
1. Using Think C 6.0 (or 7.0)
=============================
@@ -151,36 +157,7 @@
and _then_ hit Run. Why? Ask Symantec.
-2. Using MPW 3.2
-================
-
-The subdirectory MPW contains a README.MPW file, a buildall script and
-several Makefiles, kindly contributed by Richard Walker of Island
-Software. Move these files to the corresponding locations relative to
-the Python root directory (where Mac-Makefile should become Makefile
-in the Mac subdirectory, etc.), and run the buildall script. The
-README.MPW file contains more instructions and caveats (I've added
-some remarks of my own at the end).
-
-Some notes:
-
-- The MPW and THINK C ports share all source files, including config.c
- and config.h -- all differentiation is done based on #ifdef THINK_C
- or #ifdef MPW (#ifdef macintosh is used for code that should be seen
- by all Mac compilers).
-
-- The dynload subdirectory contains an attempt to create dynamically
- loadable modules from CODE segments. This was not very successful
- due to the restrictions on CODE segments (no global variables, no
- calls to external functions). Maybe Apple's new shared library
- manager will be a better starting point.
-
-- I haven't tried building STDWIN with MPW recently. There is MPW
- specific code all over the STDWIN source but it is for a much older
- version of the compiler and library.
-
-
-3. Using MicroWerks CodeWarrior 5.0
+2. Using MicroWerks CodeWarrior 5.0
===================================
Essentially, follow the instructions for Think C.
diff --git a/Mac/Relnotes-1.2 b/Mac/Relnotes-1.2
index 13010f0..f11e343 100644
--- a/Mac/Relnotes-1.2
+++ b/Mac/Relnotes-1.2
@@ -1,13 +1,19 @@
BUILDING PYTHON 1.2 FOR THE MACINTOSH
*************************************
-Python can be built on the Mac using either THINK C 6.0 (or 7.0), MPW
-3.2, or CodeWarrior 5.0. In the past it has also been compiled with
-earlier versions of Think and MPW, but no guarantees are made that the
-source is still compatible with those versions. Think C 5.0 appears
-to be OK. Likewise, new compiler versions may effectively change the
+Python can be built on the Mac using either THINK C 6.0 (or 7.0), or
+CodeWarrior 5.0 (for 68K and PPC). In the past it has also been compiled
+with earlier versions of Think, but no guarantees are made that the
+source is still compatible with those versions. (Think C 5.0 appears
+to be OK.) Likewise, new compiler versions may effectively change the
language accepted (or the library provided!) and thus cause problems.
+MPW is a special case -- it used to be possible to build Python as
+an MPW tool using MPW 3.2, and this may still work, but I haven't
+tried this lately. What I have tried, however, is building Python
+as a shared library for CFM-68K, using the Symantec C compiler for MPW.
+See subdirectory MPW and the README file there for more info.
+
1. Using Think C 6.0 (or 7.0)
=============================
@@ -151,36 +157,7 @@
and _then_ hit Run. Why? Ask Symantec.
-2. Using MPW 3.2
-================
-
-The subdirectory MPW contains a README.MPW file, a buildall script and
-several Makefiles, kindly contributed by Richard Walker of Island
-Software. Move these files to the corresponding locations relative to
-the Python root directory (where Mac-Makefile should become Makefile
-in the Mac subdirectory, etc.), and run the buildall script. The
-README.MPW file contains more instructions and caveats (I've added
-some remarks of my own at the end).
-
-Some notes:
-
-- The MPW and THINK C ports share all source files, including config.c
- and config.h -- all differentiation is done based on #ifdef THINK_C
- or #ifdef MPW (#ifdef macintosh is used for code that should be seen
- by all Mac compilers).
-
-- The dynload subdirectory contains an attempt to create dynamically
- loadable modules from CODE segments. This was not very successful
- due to the restrictions on CODE segments (no global variables, no
- calls to external functions). Maybe Apple's new shared library
- manager will be a better starting point.
-
-- I haven't tried building STDWIN with MPW recently. There is MPW
- specific code all over the STDWIN source but it is for a much older
- version of the compiler and library.
-
-
-3. Using MicroWerks CodeWarrior 5.0
+2. Using MicroWerks CodeWarrior 5.0
===================================
Essentially, follow the instructions for Think C.