[Python-checkins] r77034 - in python/branches/release26-maint: Makefile.pre.in Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Thu Dec 24 15:19:38 2009
New Revision: 77034

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Makefile.pre.in
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Makefile.pre.in
==============================================================================
--- python/branches/release26-maint/Makefile.pre.in	(original)
+++ python/branches/release26-maint/Makefile.pre.in	Thu Dec 24 15:19:38 2009
@@ -1051,6 +1051,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"
 	cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
 
 # This installs the IDE, the Launcher and other apps into /Applications

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu Dec 24 15:19:38 2009
@@ -128,6 +128,10 @@
   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
 -----