From owner-svn-src-projects@FreeBSD.ORG  Wed Mar  6 18:35:58 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0FABD6D1;
 Wed,  6 Mar 2013 18:35:58 +0000 (UTC) (envelope-from sjg@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 F1D10E13;
 Wed,  6 Mar 2013 18:35:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r26IZvJB025389;
 Wed, 6 Mar 2013 18:35:57 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r26IZvni025387;
 Wed, 6 Mar 2013 18:35:57 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201303061835.r26IZvni025387@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 6 Mar 2013 18:35:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247894 - in projects/bmake: pkgs/pseudo/stage share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 18:35:58 -0000

Author: sjg
Date: Wed Mar  6 18:35:57 2013
New Revision: 247894
URL: http://svnweb.freebsd.org/changeset/base/247894

Log:
  Use pkgs/pseudo/stage to run mtree against STAGE_OBJTOP

Added:
  projects/bmake/pkgs/pseudo/stage/
  projects/bmake/pkgs/pseudo/stage/Makefile   (contents, props changed)
Modified:
  projects/bmake/share/mk/local.dirdeps.mk

Added: projects/bmake/pkgs/pseudo/stage/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/pkgs/pseudo/stage/Makefile	Wed Mar  6 18:35:57 2013	(r247894)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+# this makefile gets hooked into everyone's dependencies so that
+# distrib-dirs can be done in STAGE_OBJTOP
+all:
+
+# mtree makes a lot of noise if we are not root, 
+# we don't need to see it.
+stage-distrib-dirs: .META
+	mkdir -p ${STAGE_OBJTOP}
+	${.MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${STAGE_OBJTOP} > $@
+
+.include <bsd.prog.mk>
+
+.if ${.MAKE.LEVEL} > 0 && ${MK_STAGING} == "yes"
+all: stage-distrib-dirs
+.endif

Modified: projects/bmake/share/mk/local.dirdeps.mk
==============================================================================
--- projects/bmake/share/mk/local.dirdeps.mk	Wed Mar  6 13:48:49 2013	(r247893)
+++ projects/bmake/share/mk/local.dirdeps.mk	Wed Mar  6 18:35:57 2013	(r247894)
@@ -13,3 +13,8 @@ DIRDEPS_FILTER+= \
 .if ${MK_SSP:Uno} != "no" && defined(PROG)
 DIRDEPS += gnu/lib/libssp/libssp_nonshared
 .endif
+
+# we need pkgs/pseudo/stage to prep the stage tree
+.if ${DEP_RELDIR:U${RELDIR}} != "pkgs/pseudo/stage"
+DIRDEPS += pkgs/pseudo/stage
+.endif