Revert r296585.
This broke installing dtrace test files. It was poorly tested. Reported by: markj Pointyhat to: bdrewery MFC after: 1 week
This commit is contained in:
@@ -6,10 +6,8 @@
|
|||||||
|
|
||||||
CONFGROUPS?= CONFS
|
CONFGROUPS?= CONFS
|
||||||
|
|
||||||
_CONFGROUPS= ${CONFGROUPS:C,[/*],_,g}
|
|
||||||
|
|
||||||
.if !target(buildconfig)
|
.if !target(buildconfig)
|
||||||
.for group in ${_CONFGROUPS}
|
.for group in ${CONFGROUPS}
|
||||||
buildconfig: ${${group}}
|
buildconfig: ${${group}}
|
||||||
.endfor
|
.endfor
|
||||||
.endif
|
.endif
|
||||||
@@ -19,7 +17,7 @@ all: buildconfig
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if !target(installconfig)
|
.if !target(installconfig)
|
||||||
.for group in ${_CONFGROUPS}
|
.for group in ${CONFGROUPS}
|
||||||
.if defined(${group}) && !empty(${group})
|
.if defined(${group}) && !empty(${group})
|
||||||
|
|
||||||
${group}OWN?= ${SHAREOWN}
|
${group}OWN?= ${SHAREOWN}
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ __<bsd.files.mk>__:
|
|||||||
|
|
||||||
FILESGROUPS?= FILES
|
FILESGROUPS?= FILES
|
||||||
|
|
||||||
_FILESGROUPS= ${FILESGROUPS:C,[/*],_,g:u}
|
.for group in ${FILESGROUPS}
|
||||||
|
|
||||||
.for group in ${_FILESGROUPS}
|
|
||||||
# Add in foo.yes and remove duplicates from all the groups
|
# Add in foo.yes and remove duplicates from all the groups
|
||||||
${${group}}:= ${${group}} ${${group}.yes}
|
${${group}}:= ${${group}} ${${group}.yes}
|
||||||
${${group}}:= ${${group}:O:u}
|
${${group}}:= ${${group}:O:u}
|
||||||
@@ -22,7 +20,7 @@ buildfiles: ${${group}}
|
|||||||
all: buildfiles
|
all: buildfiles
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.for group in ${_FILESGROUPS}
|
.for group in ${FILESGROUPS}
|
||||||
.if defined(${group}) && !empty(${group})
|
.if defined(${group}) && !empty(${group})
|
||||||
installfiles: installfiles-${group}
|
installfiles: installfiles-${group}
|
||||||
|
|
||||||
|
|||||||
@@ -8,8 +8,6 @@
|
|||||||
|
|
||||||
INCSGROUPS?= INCS
|
INCSGROUPS?= INCS
|
||||||
|
|
||||||
_INCSGROUPS= ${INCSGROUPS:C,[/*],_,g}
|
|
||||||
|
|
||||||
.if defined(NO_ROOT)
|
.if defined(NO_ROOT)
|
||||||
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
||||||
TAGS+= package=${PACKAGE:Uruntime}
|
TAGS+= package=${PACKAGE:Uruntime}
|
||||||
@@ -18,7 +16,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if !target(buildincludes)
|
.if !target(buildincludes)
|
||||||
.for group in ${_INCSGROUPS}
|
.for group in ${INCSGROUPS}
|
||||||
buildincludes: ${${group}}
|
buildincludes: ${${group}}
|
||||||
.endfor
|
.endfor
|
||||||
.endif
|
.endif
|
||||||
@@ -28,7 +26,7 @@ all: buildincludes
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if !target(installincludes)
|
.if !target(installincludes)
|
||||||
.for group in ${_INCSGROUPS}
|
.for group in ${INCSGROUPS}
|
||||||
.if defined(${group}) && !empty(${group})
|
.if defined(${group}) && !empty(${group})
|
||||||
|
|
||||||
${group}OWN?= ${BINOWN}
|
${group}OWN?= ${BINOWN}
|
||||||
|
|||||||
Reference in New Issue
Block a user