From owner-svn-src-all@FreeBSD.ORG  Mon Feb  9 16:21:50 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CB5C02E1;
 Mon,  9 Feb 2015 16:21:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B77538FD;
 Mon,  9 Feb 2015 16:21:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19GLo2m026890;
 Mon, 9 Feb 2015 16:21:50 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19GLoHW026888;
 Mon, 9 Feb 2015 16:21:50 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201502091621.t19GLoHW026888@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 9 Feb 2015 16:21:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278462 - in head: share/mk sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 16:21:50 -0000

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}