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
........
This commit is contained in:
Ronald Oussoren 2009-12-24 14:19:38 +00:00
parent 175dc9dc44
commit 63364fbda1
2 changed files with 5 additions and 0 deletions

View File

@ -1051,6 +1051,7 @@ frameworkinstallstructure: $(LDLIBRARY)
# install (which includes python-config) happy. # install (which includes python-config) happy.
frameworkinstallmaclib: frameworkinstallmaclib:
ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).a" 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)" cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
# This installs the IDE, the Launcher and other apps into /Applications # This installs the IDE, the Launcher and other apps into /Applications

View File

@ -128,6 +128,10 @@ Build
binary distribution on OSX 10.6 even when the user does not binary distribution on OSX 10.6 even when the user does not
have the 10.4u SDK installed. have the 10.4u SDK installed.
- Issue #7541: when using ``python-config`` with a framework install the compiler might
use the wrong library.
Tests Tests
----- -----