Merged revisions 77035 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77035 | ronald.oussoren | 2009-12-24 15:21:55 +0100 (Thu, 24 Dec 2009) | 9 lines
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 a35811c..2c19e15 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1068,6 +1068,7 @@
# 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 78dd84b..6bcae0a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -278,6 +278,9 @@
- Issue #6801 : symmetric_difference_update also accepts |.
Thanks to Carl Chenet.
+- Issue #7541: when using ``python-config`` with a framework install the compiler might
+ use the wrong library.
+
Documentation
-------------