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

ned-deily · ned-deily · commit eb698daf2f9a · 2011-02-07T16:44:19.000Z
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
@@ -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
diff --git 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
@@ -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
