diff options
author | Ned Deily <nad@acm.org> | 2011-05-28 12:56:14 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-05-28 12:56:14 (GMT) |
commit | 22f63b50e366d890d8babeb45402c0e05ea0a408 (patch) | |
tree | fd5cab7cc610c15e2ec6b168c75a53437642796f /Mac | |
parent | 609e36d88747ddc6e86800648f6972c61a8abfec (diff) | |
download | cpython-22f63b50e366d890d8babeb45402c0e05ea0a408.zip cpython-22f63b50e366d890d8babeb45402c0e05ea0a408.tar.gz cpython-22f63b50e366d890d8babeb45402c0e05ea0a408.tar.bz2 |
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.
Diffstat (limited to 'Mac')
-rw-r--r-- | Mac/Makefile.in | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 5ab0ae5..0e4e070 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 |