Merged revisions 70172 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70172 | ronald.oussoren | 2009-03-04 22:30:12 +0100 (Wed, 04 Mar 2009) | 7 lines

  Change framework search order when looking for Tcl/Tk on OSX.

  This is needed because the system linker looks in /Library/Framework before
  it looks in /System/Library frameworks. Without this patch _tkinter will
  be unusable when it is compiled on a system that has Tk 8.5 installed in
  /Library/Frameworks (and the Apple 8.4 install in /System/Library/Frameworks)
........

diff --git a/setup.py b/setup.py
index 712f54c3c1f3f5fb9af42b14f33a63631dc71e60..522eb82addc3274d829ef36c313bcd9a693eca06 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1083,8 +1083,8 @@ class PyBuildExt(build_ext):
         # different the UNIX search logic is not sharable.
         from os.path import join, exists
         framework_dirs = [
-            '/System/Library/Frameworks/',
             '/Library/Frameworks',
+            '/System/Library/Frameworks/',
             join(os.getenv('HOME'), '/Library/Frameworks')
         ]