diff options
| author | Ned Deily <nad@acm.org> | 2011-01-10 22:14:25 +0000 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-01-10 22:14:25 +0000 |
| commit | 4b6579054a809a840fadbe1a4a8b9cad1ba11b12 (patch) | |
| tree | f0bbc17a9f5689e01bb901b249295530da31a693 /Mac | |
| parent | bfafd3c87c83fb786a870b81c0abf72bd69ab1a7 (diff) | |
| download | cpython-4b6579054a809a840fadbe1a4a8b9cad1ba11b12.tar.gz | |
#10820: Fix OS X framework installs to support version-specific
scripts (implemented in #10679).
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Makefile.in | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in index c5cd333b52..7be4625748 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -47,8 +47,7 @@ APPSUBDIRS=MacOS Resources compileall=$(srcdir)/../Lib/compileall.py installapps: install_Python install_pythonw install_PythonLauncher install_IDLE \ - checkapplepython install_versionedtools - + checkapplepython install_pythonw: pythonw $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)" @@ -92,27 +91,6 @@ altinstallunixtools: ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done -# By default most tools are installed without a version in their basename, to -# make it easier to install (and use) several python versions side-by-side move -# the tools to a version-specific name and add the non-versioned name as an -# alias. -install_versionedtools: - for fn in idle pydoc ;\ - do \ - if [ -h "$(DESTDIR)$(prefix)/bin/$${fn}3" ]; then \ - continue ;\ - fi ;\ - mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\ - ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\ - done - mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)" - ln -sf "2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3" - if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \ - mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\ - ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \ - fi - - pythonw: $(srcdir)/Tools/pythonw.c Makefile $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK) |