Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,

ensure "make install" creates symlinks in --prefix bin for the "-32"
files in the framework bin directory like the installer does.

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 5ab0ae5f0987c5127acc33d59157b85809db16a1..0e4e0706e57c44ea73f2f93c49f8edc729b87beb 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -77,6 +77,13 @@ installunixtools:
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
+ifneq ($(LIPO_32BIT_FLAGS),)
+       for fn in python-32 pythonw-32 \
+                 python$(VERSION)-32 pythonw$(VERSION)-32 ;\
+       do \
+               ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+       done
+endif
 
 
 #
@@ -91,6 +98,12 @@ altinstallunixtools:
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
+ifneq ($(LIPO_32BIT_FLAGS),)
+       for fn in python$(VERSION)-32 pythonw$(VERSION)-32 ;\
+       do \
+               ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+       done
+endif
        ln -fs "$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/2to3-$(VERSION)" ;\
 
 # By default most tools are installed without a version in their basename, to

diff --git a/Misc/NEWS b/Misc/NEWS
index 62c1b4fd451e4a66c9f131682dcb5fc48e21a698..47c47850f77dd258c72c5146c6e0a22ba55c3913 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -437,6 +437,10 @@ Extension Modules
 Build
 -----
 
+- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
+  ensure "make install" creates symlinks in --prefix bin for the "-32"
+  files in the framework bin directory like the installer does.
+
 - Issue #11411: Fix 'make DESTDIR=' with a relative destination.
 
 - Issue #10709: Add updated AIX notes in Misc/README.AIX.