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 5e57b579427294f144efa2e13e7cf07157512bd7..8a62a9097c23e1af847222fc412c433d45855b41 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -76,6 +76,13 @@ installunixtools:
        do \
                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
        done
+ifneq ($(LIPO_32BIT_FLAGS),)
+       for fn in python3-32 pythonw3-32 \
+                 python$(VERSION)-32 pythonw$(VERSION)-32 ;\
+       do \
+               ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+       done
+endif
 
 
 #
@@ -90,6 +97,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
 
 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 df6933af72ee3008dce1a69debcad115047bdaab..496272105149087311ecf962da9a4153f250516b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,12 @@ Library
 - Issue #12065: connect_ex() on an SSL socket now returns the original errno
   when the socket's timeout expires (it used to return None).
 
+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.
 
 
 What's New in Python 3.2.1 release candidate 1?