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 b1c1735df4b8daa661197da8d0357969bc0c5f3b..5d70f106b82b46eb2d033ad399ace9a9b513185e 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1051,6 +1051,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"
        cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
 
 # This installs the IDE, the Launcher and other apps into /Applications

diff --git a/Misc/NEWS b/Misc/NEWS
index 5c18341a91c47965299a0fd3c58bc6bd6f3dd92b..adc053b6a83db633cfe6b078a5f66e2135e14f81 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -128,6 +128,10 @@ Build
   binary distribution on OSX 10.6 even when the user does not
   have the 10.4u SDK installed.
 
+- Issue #7541: when using ``python-config`` with a framework install the compiler might
+  use the wrong library.
+
+
 Tests
 -----