From owner-p4-projects@FreeBSD.ORG  Sun Aug 26 11:52:05 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EFB15106566C; Sun, 26 Aug 2012 11:52:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6BCEC106564A
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 11:52:03 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 54B608FC08
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 11:52:03 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QBq35I044716
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 11:52:03 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QBq3SD044713
	for perforce@freebsd.org; Sun, 26 Aug 2012 11:52:03 GMT
	(envelope-from brooks@freebsd.org)
Date: Sun, 26 Aug 2012 11:52:03 GMT
Message-Id: <201208261152.q7QBq3SD044713@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 216529 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2012 11:52:05 -0000

http://p4web.freebsd.org/@@216529?ac=10

Change 216529 by brooks@brooks_zenith on 2012/08/26 11:51:41

	Add a LOCAL_MTREE variable to Makefile.inc1 to allow things built
	by LOCAL_*_DIRS to install things in directories not in the base
	hierarchy without resorting to gross hacks.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#6 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#6 (text+ko) ====

@@ -388,6 +388,9 @@
 	mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 .endif
+.for _mtree in ${LOCAL_MTREE}
+	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
+.endfor
 _legacy:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1199,6 +1202,10 @@
 #
 hierarchy hier:
 	cd ${.CURDIR}/etc;		${MAKE} distrib-dirs
+.for _mtree in ${LOCAL_MTREE}
+	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/${_mtree} \
+	    -p ${DESTDIR}/
+.endfor
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.