svn commit: r278462 - in head: share/mk sys/conf

[Warner Losh]

Author: imp
Date: Mon Feb  9 16:21:49 2015
New Revision: 278462
URL: https://svnweb.freebsd.org/changeset/base/278462

Log:
  Move these definitions to bsd.own.mk along side the kernel directory /
  user defines. Make this work with WITH_INSTALL_AS_USER as well.
  
  Noticed by: ian@

Modified:
  head/share/mk/bsd.own.mk
  head/sys/conf/dtb.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Mon Feb  9 16:10:30 2015	(r278461)
+++ head/share/mk/bsd.own.mk	Mon Feb  9 16:21:49 2015	(r278462)
@@ -141,7 +141,7 @@ _uid!=	id -u
 USER!=	id -un
 .endif
 _gid!=	id -gn
-.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE
+.for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE
 $xOWN=	${USER}
 $xGRP=	${_gid}
 .endfor
@@ -164,6 +164,10 @@ KMODDIR?=	/boot/kernel
 KMODOWN?=	${BINOWN}
 KMODGRP?=	${BINGRP}
 KMODMODE?=	${BINMODE}
+DTBDIR?=	/boot/dtb
+DTBOWN?=	root
+DTBGRP?=	wheel
+DTBMODE?=	444
 
 LIBDIR?=	/usr/lib
 LIBCOMPATDIR?=	/usr/lib/compat

Modified: head/sys/conf/dtb.mk
==============================================================================
--- head/sys/conf/dtb.mk	Mon Feb  9 16:10:30 2015	(r278461)
+++ head/sys/conf/dtb.mk	Mon Feb  9 16:21:49 2015	(r278462)
@@ -45,10 +45,6 @@ SYSDIR=	${_dir}
 
 .PATH: ${SYSDIR}/gnu/dts/${MACHINE} ${SYSDIR}/boot/fdt/dts/${MACHINE}
 
-DTBDIR?=/boot/dtb
-DTBOWN?=root
-DTBGRP?=wheel
-DTBMODE?=444
 DTB=${DTS:R:S/$/.dtb/}
 
 all: ${DTB}