Issue #11079: The /Applications/Python x.x folder created by the Mac

OS X installers no longer includes an Extras directory.  The Tools
directory is now installed in the framework under share/doc.

diff --git a/Mac/BuildScript/resources/ReadMe.txt b/Mac/BuildScript/resources/ReadMe.txt
index 761cffb06b271dcda3532f32a6c5023069d07de4..f1beda0fbe26da0322f2d7819a367974c1d9abe2 100644 (file)
--- a/Mac/BuildScript/resources/ReadMe.txt
+++ b/Mac/BuildScript/resources/ReadMe.txt
@@ -24,7 +24,7 @@ of Tcl/Tk for this version of Python and Mac OS X.
                     *******************
 
 The installer puts applications, an "Update Shell Profile" command,
-and an Extras folder containing demo programs and tools into the
+and a link to the optionally installed Python Documentation into the
 "Python $VERSION" subfolder of the system Applications folder,
 and puts the underlying machinery into the folder
 $PYTHONFRAMEWORKINSTALLDIR. It can

diff --git a/Mac/Extras.ReadMe.txt b/Mac/Extras.ReadMe.txt
deleted file mode 100644 (file)
index 2d7fd42..0000000
--- a/Mac/Extras.ReadMe.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This folder contains examples of Python usage and useful scripts and tools.
-
-You should be aware that these are not Macintosh-specific but are shared
-among Python on all platforms, so there are some that only run on Windows
-or Unix or another platform, and/or make little sense on a Macintosh.

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index bc0c90d9686cb785f5c78e3e15d2234e5fb5ab9b..5e57b579427294f144efa2e13e7cf07157512bd7 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -177,11 +177,11 @@ install_IDLE:
 
 $(INSTALLED_PYTHONAPP): install_Python
 
-installextras: $(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py
-       $(INSTALL) -d "$(DESTDIR)$(PYTHONAPPSDIR)/Extras"
-       $(INSTALL) $(srcdir)/Extras.ReadMe.txt "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe.txt"
+installextras: $(srcdir)/Extras.install.py
+       $(INSTALL) -d "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples"
        $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../Tools \
-               "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools"
+               "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples/Tools" ; \
+               chmod -R ugo+rX,go-w "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples/Tools"
 
 
 checkapplepython: $(srcdir)/Tools/fixapplepython23.py

diff --git a/Misc/NEWS b/Misc/NEWS
index 1a5402470dfcfea1b36b217bafab22dc71d16e38..4a7e3a98a102f0fc90bdd7134de1b5d5e20bfeca 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,11 @@ Library
 Build
 -----
 
+- Issue #11079: The /Applications/Python x.x folder created by the Mac
+  OS X installers now includes a link to the installed documentation
+  and no longer includes an Extras directory.  The Tools directory is
+  now installed in the framework under share/doc.
+
 - Issue #11121: Fix building with --enable-shared.
 
 Tests