Merged revisions 73303 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73303 | ronald.oussoren | 2009-06-08 13:54:59 -0700 (Mon, 08 Jun 2009) | 11 lines

  This checkin adds a symlink to the lib directory of a framework install
  of Python (on OSX), and the end result of that is that the combination of
  ``python-config --ldflags`` and ``python-config --libs`` refers to an actually
  existing location.

  I've done this in preference to changing python-config to specify
  '-framework Python' for linking because that doesn't work when you have multiple
  versions of python installed (because '-framework Python' will always link to
  the 'Current' version of the framework, without a possibility to specify a
  specific version).
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 20483f713f77852e0352adc7f2572b3f3497f97e..2f5ccccf30e9f2e6c8b5ecc352e4b383015d347e 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1068,6 +1068,7 @@ frameworkinstallstructure:        $(LDLIBRARY)
 # install (which includes python-config) happy.
 frameworkinstallmaclib:
        ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).a"
+       ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib"
 
 # This installs the IDE, the Launcher and other apps into /Applications
 frameworkinstallapps: