From a390aab8573d52d24403baa43f0d9095d5a2308e Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Thu, 17 Jan 2013 18:32:30 +0000
Subject: Rework the mtree portion of etc/Makefile's distrib-dirs target to run
 mtree in a shell loop so there is only one mtree commandline.  Move the
 implementation of LOCAL_MTREE into etc/Makefile.

Sponsored by:	DARPA, AFRL
Reviewed by:	mtree :)
---
 Makefile.inc1 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index ca30e75..3ba82ea 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -717,7 +717,7 @@ distributeworld installworld: installcheck
 .endfor
 	-mkdir ${DESTDIR}/${DISTDIR}/base
 	${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \
-	    DESTDIR=${DESTDIR}/${DISTDIR}/base
+	    LOCAL_MTREE=${LOCAL_MTREE} DESTDIR=${DESTDIR}/${DISTDIR}/base
 .endif
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}
@@ -1248,11 +1248,7 @@ cross-tools:
 # hierarchy - ensure that all the needed directories are present
 #
 hierarchy hier:
-	cd ${.CURDIR}/etc;		${MAKE} distrib-dirs
-.for _mtree in ${LOCAL_MTREE}
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/${_mtree} \
-	    -p ${DESTDIR}/
-.endfor
+	cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
-- 
cgit v1.1