*** /Users/senn/Desktop/build-installer.py	2008-10-02 15:52:44.000000000 -0400
--- build-installer.py	2008-10-02 18:17:55.000000000 -0400
***************
*** 585,605 ****
      version = getVersion()
      docdir = os.path.join(rootDir, 'pydocs')
  
      name = 'html-%s.tar.bz2'%(getFullVersion(),)
      sourceArchive = os.path.join(DEPSRC, name)
      if os.path.exists(sourceArchive):
          print "Using local copy of %s"%(name,)
  
      else:
!         print "Downloading %s"%(name,)
          downloadURL('http://www.python.org/ftp/python/doc/%s/%s'%(
!             getFullVersion(), name), sourceArchive)
          print "Archive for %s stored as %s"%(name, sourceArchive)
  
      extractArchive(os.path.dirname(docdir), sourceArchive)
      os.rename(
              os.path.join(
!                 os.path.dirname(docdir), 'Python-Docs-%s'%(getFullVersion(),)),
              docdir)
  
  
--- 585,607 ----
      version = getVersion()
      docdir = os.path.join(rootDir, 'pydocs')
  
+     novername = 'python-docs-html.tar.bz2'
      name = 'html-%s.tar.bz2'%(getFullVersion(),)
      sourceArchive = os.path.join(DEPSRC, name)
      if os.path.exists(sourceArchive):
          print "Using local copy of %s"%(name,)
  
      else:
!         print "Downloading %s"%(novername,)
          downloadURL('http://www.python.org/ftp/python/doc/%s/%s'%(
!             getFullVersion(), novername), sourceArchive)
          print "Archive for %s stored as %s"%(name, sourceArchive)
  
      extractArchive(os.path.dirname(docdir), sourceArchive)
+ 
      os.rename(
              os.path.join(
!                 os.path.dirname(docdir), 'python-docs-html'),
              docdir)
  
  
***************
*** 1028,1038 ****
      buildPython()
      buildPythonDocs()
      fn = os.path.join(WORKDIR, "_root", "Applications",
!                 "MacPython %s"%(getVersion(),), "Update Shell Profile.command")
      patchFile("scripts/postflight.patch-profile",  fn)
      os.chmod(fn, 0755)
  
!     folder = os.path.join(WORKDIR, "_root", "Applications", "MacPython %s"%(
          getVersion(),))
      os.chmod(folder, 0755)
      setIcon(folder, "../Icons/Python Folder.icns")
--- 1030,1040 ----
      buildPython()
      buildPythonDocs()
      fn = os.path.join(WORKDIR, "_root", "Applications",
!                 "Python %s"%(getVersion(),), "Update Shell Profile.command")
      patchFile("scripts/postflight.patch-profile",  fn)
      os.chmod(fn, 0755)
  
!     folder = os.path.join(WORKDIR, "_root", "Applications", "Python %s"%(
          getVersion(),))
      os.chmod(folder, 0755)
      setIcon(folder, "../Icons/Python Folder.icns")