[Python-checkins] r80367 - in python/branches/release31-maint: Mac/BuildScript/build-installer.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Apr 22 15:18:09 2010
New Revision: 80367

Log:
Merged revisions 80366 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80366 | martin.v.loewis | 2010-04-22 15:16:44 +0200 (Do, 22 Apr 2010) | 10 lines
  
  Merged revisions 80355 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80355 | martin.v.loewis | 2010-04-22 13:34:36 +0200 (Do, 22 Apr 2010) | 3 lines
    
    Issue #8475: Pass absolute interpreter path to
    "make html".
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Mac/BuildScript/build-installer.py

Modified: python/branches/release31-maint/Mac/BuildScript/build-installer.py
==============================================================================
--- python/branches/release31-maint/Mac/BuildScript/build-installer.py	(original)
+++ python/branches/release31-maint/Mac/BuildScript/build-installer.py	Thu Apr 22 15:18:09 2010
@@ -734,7 +734,7 @@
     curDir = os.getcwd()
     os.chdir(buildDir)
     runCommand('make update')
-    runCommand('make html')
+    runCommand("make html PYTHON='%s'" % os.path.abspath(sys.executable))
     os.chdir(curDir)
     if not os.path.exists(docdir):
         os.mkdir(docdir)