diff options
author | Ned Deily <nad@acm.org> | 2011-05-28 05:59:55 -0700 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-05-28 05:59:55 -0700 |
commit | d1bf595bc2e8313c84a5785092f8bc2a1e237b2b (patch) | |
tree | 1a52e708e4b0cc9f5fc457cb32926958eb5b9966 /Mac | |
parent | 3f81f826b5461094d437e9477fde2cedd308792f (diff) | |
download | cpython-d1bf595bc2e8313c84a5785092f8bc2a1e237b2b.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.
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 5e57b57942..8a62a9097c 100644 --- 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) |