Merged revisions 70746 via svnmerge from

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

........
  r70746 | ronald.oussoren | 2009-03-30 15:02:08 -0500 (Mon, 30 Mar 2009) | 2 lines

  Fix for issue 13095
........

diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
index 795c9bcf3218347696803e30d5b97932538d45f5..4fce263f0cbbd35e613297d8eec7782bcdc781f5 100644 (file)
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -189,7 +189,7 @@ applications should use string objects to access all files.
 
 .. function:: normcase(path)
 
-   Normalize the case of a pathname.  On Unix, this returns the path unchanged; on
+   Normalize the case of a pathname.  On Unix and MacOSX, this returns the path unchanged; on
    case-insensitive filesystems, it converts the path to lowercase.  On Windows, it
    also converts forward slashes to backward slashes.
 

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 0a93a4c97b483b242cee9cb939460aabb815e546..ea56ab0edfe0c1bb33df9f538b644cf524ef29d1 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -644,6 +644,11 @@ def buildPython():
     # several paths.
     version = getVersion()
 
+    # Since the extra libs are not in their installed framework location
+    # during the build, augment the library path so that the interpreter
+    # will find them during its extension import sanity checks.
+    os.environ['DYLD_LIBRARY_PATH'] = os.path.join(WORKDIR,
+                                        'libraries', 'usr', 'local', 'lib')
     print "Running configure..."
     runCommand("%s -C --enable-framework --enable-universalsdk=%s "
                "--with-universal-archs=%s --with-computed-gotos"
@@ -665,6 +670,7 @@ def buildPython():
     runCommand("make frameworkinstallextras DESTDIR=%s"%(
         shellQuote(rootDir)))
 
+    del os.environ['DYLD_LIBRARY_PATH']
     print "Copying required shared libraries"
     if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
         runCommand("mv %s/* %s"%(