summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-12-24 14:21:55 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2009-12-24 14:21:55 +0000
commit585c1733c89a68fa78de7f0569d19d351a8e2a19 (patch)
tree01dcbecca377552f74ee9d25a1bf176278828bc6
parent6f6c56249295a69965cd404900997c4ea4ac6130 (diff)
downloadcpython-git-585c1733c89a68fa78de7f0569d19d351a8e2a19.tar.gz
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 ........
-rw-r--r--Makefile.pre.in1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 023e51779b..82264e5b0c 100644
--- 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 2f22e476a9..9e9430bf1a 100644
--- 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
------------