From 965c63f27585bec810cbfba67279bfe74891dd1b Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sat, 28 May 2011 05:56:14 -0700 Subject: 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. --- Mac/Makefile.in | 13 +++++++++++++ Misc/NEWS | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 5ab0ae5f09..0e4e0706e5 100644 --- 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 62c1b4fd45..47c47850f7 100644 --- 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. -- cgit v1.2.1