From: Ned Deily <nad@acm.org>
Date: Mon, 21 Feb 2011 20:44:27 +0000 (+0000)
Subject: Issue #11268: Prevent Mac OS X Installer failure if Documentation
X-Git-Tag: v3.3.0a1~3137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5eaee2e23b374f83628d20acfc542092f1493b14;p=python

Issue #11268: Prevent Mac OS X Installer failure if Documentation
package had previously been installed.
---

diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation
index 30d2ee527b..31fbf2feff 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 65ae5f9050..d01a0e1d93 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,7 +21,14 @@ Library
 - Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
   larger than 4GB.  Patch by Nadeem Vawda.
 
+Build
+-----
+
+- Issue #11268: Prevent Mac OS X Installer failure if Documentation
+  package had previously been installed.
+
 Tests
+-----
 
 - Issue #10990: Prevent tests from clobbering a set trace function.