From e6cc7d64275cc90c2b05fc29604d0e02ff2bc2d8 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Mon, 21 Feb 2011 21:00:09 +0000
Subject: [PATCH] Merged revisions 88475 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88475 | ned.deily | 2011-02-21 12:44:27 -0800 (Mon, 21 Feb 2011) | 3 lines

  Issue #11268: Prevent Mac OS X Installer failure if Documentation
  package had previously been installed.
........
---
 Mac/BuildScript/scripts/postflight.documentation | 2 +-
 Misc/NEWS                                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation
index 30d2ee527ba0..31fbf2feffd7 100755
--- a/Mac/BuildScript/scripts/postflight.documentation
+++ b/Mac/BuildScript/scripts/postflight.documentation
@@ -27,6 +27,6 @@ fi
 if [ -d "${SHARE_DIR}" ]; then
     mkdir -p "${SHARE_DOCDIR}"
     # make relative link to html doc directory
-    ln -s "${SHARE_DOCDIR_TO_FWK}/${FWK_DOCDIR_SUBPATH}" "${SHARE_DOCDIR}/html"
+    ln -fhs "${SHARE_DOCDIR_TO_FWK}/${FWK_DOCDIR_SUBPATH}" "${SHARE_DOCDIR}/html"
 fi
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 40c564435a39..bd086c877c1a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -173,6 +173,9 @@ Extension Modules
 Build
 -----
 
+- Issue #11268: Prevent Mac OS X Installer failure if Documentation
+  package had previously been installed.
+
 - Issue #11079: The /Applications/Python x.x folder created by the Mac
   OS X installers now includes a link to the installed documentation.