Merged revisions 77033 via svnmerge from

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

........
  r77033 | ronald.oussoren | 2009-12-24 15:17:19 +0100 (Thu, 24 Dec 2009) | 2 lines

  Fix for issue #7541: python-config --ldflags doesn't pick up libpython2.5.a
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 023e51779b89ae3e51a2825c44fc58d01f113599..82264e5b0c43bf22f1a2c4c3e984a6f5e0df4c6b 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1067,6 +1067,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/python$(VERSION)/config/libpython$(VERSION).dylib"
        ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib"
 
 # This installs the IDE, the Launcher and other apps into /Applications

diff --git a/Misc/NEWS b/Misc/NEWS
index 2f22e476a99f6292faa9b1485a9752972656cc93..9e9430bf1a80b657e5011ccd63b30445e0e43095 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -516,6 +516,9 @@ Build
 - Issue 5390: Add uninstall icon independent of whether file
   extensions are installed.
 
+- Issue #7541: when using ``python-config`` with a framework install the compiler might
+  use the wrong library.
+
 Documentation
 ------------