diff options
| author | Ned Deily <nad@acm.org> | 2011-05-28 05:56:14 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-05-28 05:56:14 -0700 |
| commit | 965c63f27585bec810cbfba67279bfe74891dd1b (patch) | |
| tree | 4fe3d3966950a83738ec5eca66567af4fd186aff | |
| parent | d67203e48529b5db7002f072b03fc80734c61f9b (diff) | |
| download | cpython-965c63f27585bec810cbfba67279bfe74891dd1b.tar.gz | |
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.
| -rw-r--r-- | Mac/Makefile.in | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 17 insertions, 0 deletions
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 @@ -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. |