[Python-checkins] r87908 - in python/branches/py3k: Mac/Makefile.in Misc/NEWS
ned.deily
python-checkins at python.org
Mon Jan 10 23:14:25 CET 2011
Author: ned.deily
Date: Mon Jan 10 23:14:25 2011
New Revision: 87908
Log:
#10820: Fix OS X framework installs to support version-specific
scripts (implemented in #10679).
Modified:
python/branches/py3k/Mac/Makefile.in
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Mac/Makefile.in
==============================================================================
--- python/branches/py3k/Mac/Makefile.in (original)
+++ python/branches/py3k/Mac/Makefile.in Mon Jan 10 23:14:25 2011
@@ -47,8 +47,7 @@
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 @@
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)
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Mon Jan 10 23:14:25 2011
@@ -189,6 +189,9 @@
Build
-----
+- Issue #10820: Fix OS X framework installs to support version-specific
+ scripts (#10679).
+
- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
the configure script but use $GREP instead. Patch by Fabian Groffen.
More information about the Python-checkins
mailing list