From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 31 Mar 2009 13:23:26 +0000 (+0000)
Subject: Merged revisions 70802 via svnmerge from
X-Git-Tag: v2.6.2c1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85da5e83de6bf0d5b670dffaed5b646c5ca5887b;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 70802 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70802 | ronald.oussoren | 2009-03-31 08:20:45 -0500 (Tue, 31 Mar 2009) | 4 lines

  Minor update to OSX build-installer script, needed
  to ensure that the build will succeed in a clean
  checkout and with a non-default deployment target.
........
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index d5da074cb442..8d85434d1d7c 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1018,7 +1018,18 @@ def main():
 
     # Now build python itself
     buildPython()
+
+    # And then build the documentation
+    # Remove the Deployment Target from the shell
+    # environment, it's no longer needed and
+    # an unexpected build target can cause problems
+    # when Sphinx and its dependencies need to
+    # be (re-)installed.
+    del os.environ['MACOSX_DEPLOYMENT_TARGET']
     buildPythonDocs()
+
+
+    # Prepare the applications folder
     fn = os.path.join(WORKDIR, "_root", "Applications",
                 "Python %s"%(getVersion(),), "Update Shell Profile.command")
     patchScript("scripts/postflight.patch-profile",  fn)