From owner-svn-src-projects@freebsd.org Wed Aug 2 02:56:50 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47B6FDC3920
for <svn-src-projects@mailman.ysv.freebsd.org>;
Wed, 2 Aug 2017 02:56:50 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 2130D722B0;
Wed, 2 Aug 2017 02:56:50 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v722unlf080743;
Wed, 2 Aug 2017 02:56:49 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v722unLn080740;
Wed, 2 Aug 2017 02:56:49 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708020256.v722unLn080740@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Wed, 2 Aug 2017 02:56:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r321900 - projects/make-check-sandbox/share/mk
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/make-check-sandbox/share/mk
X-SVN-Commit-Revision: 321900
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Aug 2017 02:56:50 -0000
Author: ngie
Date: Wed Aug 2 02:56:48 2017
New Revision: 321900
URL: https://svnweb.freebsd.org/changeset/base/321900
Log:
Add _FILESMKDIR
_FILESMKDIR is an internal knob for creating directories
It's by no means a substitute for mtrees since the semantics for using install
are a bit rudimentary -- it's meant purely to simplify automatic directory creation
without having to invoke "make hier[archy]" from ${SRCTOP} in order to populate
a directory tree.
Modified:
projects/make-check-sandbox/share/mk/bsd.files.mk
projects/make-check-sandbox/share/mk/bsd.prog.mk
Modified: projects/make-check-sandbox/share/mk/bsd.files.mk
==============================================================================
--- projects/make-check-sandbox/share/mk/bsd.files.mk Wed Aug 2 01:43:35 2017 (r321899)
+++ projects/make-check-sandbox/share/mk/bsd.files.mk Wed Aug 2 02:56:48 2017 (r321900)
@@ -69,6 +69,10 @@ stage_as.${file:T}: ${file}
installfiles-${group}: _${group}INS_${file:T}
_${group}INS_${file:T}: ${file}
+.ifdef _FILESMKDIR
+ ${INSTALL} -d \
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}:H}
+.endif
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
@@ -83,10 +87,16 @@ stage_files.${group}: ${_${group}FILES}
installfiles-${group}: _${group}INS
_${group}INS: ${_${group}FILES}
.if defined(${group}NAME)
+.ifdef _FILESMKDIR
+ ${INSTALL} -d ${DESTDIR}${${${group}DIR}/${${group}NAME}
+.endif
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} \
${DESTDIR}${${group}DIR}/${${group}NAME}
.else
+.ifdef _FILESMKDIR
+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/
+.endif
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/
.endif
Modified: projects/make-check-sandbox/share/mk/bsd.prog.mk
==============================================================================
--- projects/make-check-sandbox/share/mk/bsd.prog.mk Wed Aug 2 01:43:35 2017 (r321899)
+++ projects/make-check-sandbox/share/mk/bsd.prog.mk Wed Aug 2 02:56:48 2017 (r321900)
@@ -268,6 +268,10 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
+.ifdef _FILESMKDIR
+ ${INSTALL} -d \
+ ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}/${SCRIPTSNAME_${.ALLSRC:T}:H}
+.endif
${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
${.ALLSRC} \