#10820: Fix OS X framework installs to support version-specific

        scripts (implemented in #10679).

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index c5cd333b52e05fd3d1d6f9884bfb5029c3796568..7be4625748dc9849340c4db762b43ec5ee29a375 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -47,8 +47,7 @@ APPSUBDIRS=MacOS Resources
 compileall=$(srcdir)/../Lib/compileall.py
 
 installapps: install_Python install_pythonw install_PythonLauncher install_IDLE \
-       checkapplepython install_versionedtools
-
+       checkapplepython
 
 install_pythonw: pythonw
        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
@@ -92,27 +91,6 @@ altinstallunixtools:
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
 
-# By default most tools are installed without a version in their basename, to
-# make it easier to install (and use) several python versions side-by-side move
-# the tools to a version-specific name and add the non-versioned name as an
-# alias.
-install_versionedtools:
-       for fn in idle pydoc ;\
-       do \
-               if [ -h "$(DESTDIR)$(prefix)/bin/$${fn}3" ]; then \
-                       continue ;\
-               fi ;\
-               mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)"  ;\
-               ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\
-       done
-       mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)"
-       ln -sf "2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3"
-       if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \
-               mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
-               ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \
-       fi
-
-
 pythonw: $(srcdir)/Tools/pythonw.c Makefile
        $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 245930273d2c64d7e3359c0a2d2e620e21a6ba41..b123cb1a6d6284f30e34b92dbd8088bbd78e9b72 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -189,6 +189,9 @@ C-API
 Build
 -----
 
+- Issue #10820: Fix OS X framework installs to support version-specific
+  scripts (#10679).
+
 - Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
   the configure script but use $GREP instead.  Patch by Fabian Groffen.