svn commit: r321900 - projects/make-check-sandbox/share/mk
Ngie Cooper
ngie at FreeBSD.org
Wed Aug 2 02:56:50 UTC 2017
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} \
More information about the svn-src-projects
mailing list