Fix for issue 9392: without this patch a framework build will not install

2to3-2.7, while a versioned copy is installed of other tools and a versioned copy of2to3 is installed by python 2.6, 3.1 and the 3.2 alpha.

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 12c1fcd15b38dc75f627647e78f3f661afcb3b92..5ab0ae5f0987c5127acc33d59157b85809db16a1 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -70,9 +70,10 @@ installunixtools:
        if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then  \
                $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
        fi
-       for fn in python pythonw idle pydoc python-config smtpd.py   \
+       for fn in python pythonw idle pydoc python-config smtpd.py 2to3 \
                  python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
-                 pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py ;\
+                 pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py \
+                 2to3-$(VERSION) ;\
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
@@ -90,6 +91,7 @@ altinstallunixtools:
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
+       ln -fs "$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/2to3-$(VERSION)" ;\
 
 # 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
@@ -112,6 +114,10 @@ install_versionedtools:
                mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py"  ;\
                ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
        fi
+       if [ ! -h "$(DESTDIR)$(prefix)/bin/2to3" ]; then \
+               mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)"  ;\
+               ln -sf "2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3" ;\
+       fi
 
 
 pythonw: $(srcdir)/Tools/pythonw.c Makefile

diff --git a/Misc/NEWS b/Misc/NEWS
index 02472c8079350f767dc6c8676adcd60473ed79fd..09cfe3c0c1345cf66cb83f9bdb3a59e391c96cdc 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,8 @@ Build
 
 - Issue #9275: The OSX installer once again installs links to binaries in ``/usr/local/bin``
 
+- Issue #9392: A framework build on OSX  will once again use a versioned name of the ``2to3`` tool, that is you can use ``2to3-2.7`` to select the Python 2.7 edition of 2to3.
+
 Tests
 -----