svn commit: r247894 - in projects/bmake: pkgs/pseudo/stage share/mk

[Simon J. Gerraty]

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