From owner-svn-src-all@FreeBSD.ORG  Thu Jan 17 23:05:04 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 99E57D10;
 Thu, 17 Jan 2013 23:05:04 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8D879B00;
 Thu, 17 Jan 2013 23:05:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0HN54Lq037020;
 Thu, 17 Jan 2013 23:05:04 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0HN5434037019;
 Thu, 17 Jan 2013 23:05:04 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301172305.r0HN5434037019@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 17 Jan 2013 23:05:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245580 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2013 23:05:04 -0000

Author: brooks
Date: Thu Jan 17 23:05:03 2013
New Revision: 245580
URL: http://svnweb.freebsd.org/changeset/base/245580

Log:
  In r245571, "rm -rf <foo>; ln -s <bar> <foo>" needed to be replaced with
  "ln -sfh <bar> <foo>" or the links would fail when a valid link to a
  directly was in place at <foo>.
  
  Reported by:	peter
  Tested by:	peter
  Pointy hat to:	brooks

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Jan 17 22:14:58 2013	(r245579)
+++ head/etc/Makefile	Thu Jan 17 23:05:03 2013	(r245580)
@@ -324,26 +324,26 @@ distrib-dirs:
 		    -f $$m -p $$d; \
 		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 	done; true
-	ln -sf usr/src/sys ${DESTDIR}/sys
+	ln -sfh usr/src/sys ${DESTDIR}/sys
 	cd ${DESTDIR}/usr/share/man; \
 	for mandir in man*; do \
-		ln -sf ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
-		ln -sf ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \
+		ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
+		ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \
 	done
 	cd ${DESTDIR}/usr/share/openssl/man; \
 	for mandir in man*; do \
-		ln -sf ../$$mandir \
+		ln -sfh ../$$mandir \
 		    ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
 	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; do \
-		ln -sf "$$2" "${DESTDIR}/usr/share/man/$$1"; \
-		ln -sf "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \
+		ln -sfh "$$2" "${DESTDIR}/usr/share/man/$$1"; \
+		ln -sfh "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \
 		shift; shift; \
 	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
-		ln -sf "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
+		ln -sfh "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
 		shift; shift; \
 	done