From a938a1fcf85b48c8f1e4d422aeb0322fdf0622de Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Fri, 15 Sep 2000 08:07:05 +0000
Subject: [PATCH] Add/use MTREE_FOLLOWS_SYMLINKS make.conf option This is part
 of whole subsystem fixing

Reviewed by:	imp
---
 etc/Makefile                 | 10 +++++-----
 etc/defaults/make.conf       |  3 +++
 share/examples/etc/make.conf |  3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 333a32432892..8c18ea4b5811 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -148,12 +148,12 @@ distribution:
 .endif
 
 distrib-dirs:
-	mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
-	mtree -deU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
-	mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
-	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
-	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/libdata/perl/5.6.0/mach
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/locale; \
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 607f4444a2e6..bed1cdc84e3a 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -43,6 +43,9 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # Compare before install
 #INSTALL=install -C
 #
+# Mtree will follow symlinks
+MTREE_FOLLOWS_SYMLINKS= -L
+#
 # To enable building enstalling suidperl with the setuid bit turned on
 #ENABLE_SUIDPERL=	true
 #
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 607f4444a2e6..bed1cdc84e3a 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -43,6 +43,9 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # Compare before install
 #INSTALL=install -C
 #
+# Mtree will follow symlinks
+MTREE_FOLLOWS_SYMLINKS= -L
+#
 # To enable building enstalling suidperl with the setuid bit turned on
 #ENABLE_SUIDPERL=	true
 #