Author: bdrewery
Date: Sat Dec 3 05:29:31 2016
New Revision: 309477
URL: https://svnweb.freebsd.org/changeset/base/309477
Log:
Revert r296585.
This broke installing dtrace test files. It was poorly tested.
Reported by: markj
Pointyhat to: bdrewery
MFC after: 1 week
Modified:
head/share/mk/bsd.confs.mk
head/share/mk/bsd.files.mk
head/share/mk/bsd.incs.mk
Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk Sat Dec 3 05:29:12 2016 (r309476)
+++ head/share/mk/bsd.confs.mk Sat Dec 3 05:29:31 2016 (r309477)
@@ -6,10 +6,8 @@
CONFGROUPS?= CONFS
-_CONFGROUPS= ${CONFGROUPS:C,[/*],_,g}
-
.if !target(buildconfig)
-.for group in ${_CONFGROUPS}
+.for group in ${CONFGROUPS}
buildconfig: ${${group}}
.endfor
.endif
@@ -19,7 +17,7 @@ all: buildconfig
.endif
.if !target(installconfig)
-.for group in ${_CONFGROUPS}
+.for group in ${CONFGROUPS}
.if defined(${group}) && !empty(${group})
${group}OWN?= ${SHAREOWN}
Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk Sat Dec 3 05:29:12 2016 (r309476)
+++ head/share/mk/bsd.files.mk Sat Dec 3 05:29:31 2016 (r309477)
@@ -9,9 +9,7 @@ __<bsd.files.mk>__:
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
${${group}}:= ${${group}} ${${group}.yes}
${${group}}:= ${${group}:O:u}
@@ -22,7 +20,7 @@ buildfiles: ${${group}}
all: buildfiles
.endif
-.for group in ${_FILESGROUPS}
+.for group in ${FILESGROUPS}
.if defined(${group}) && !empty(${group})
installfiles: installfiles-${group}
Modified: head/share/mk/bsd.incs.mk
==============================================================================
--- head/share/mk/bsd.incs.mk Sat Dec 3 05:29:12 2016 (r309476)
+++ head/share/mk/bsd.incs.mk Sat Dec 3 05:29:31 2016 (r309477)
@@ -8,8 +8,6 @@
INCSGROUPS?= INCS
-_INCSGROUPS= ${INCSGROUPS:C,[/*],_,g}
-
.if defined(NO_ROOT)
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uruntime}
@@ -18,7 +16,7 @@ TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
.endif
.if !target(buildincludes)
-.for group in ${_INCSGROUPS}
+.for group in ${INCSGROUPS}
buildincludes: ${${group}}
.endfor
.endif
@@ -28,7 +26,7 @@ all: buildincludes
.endif
.if !target(installincludes)
-.for group in ${_INCSGROUPS}
+.for group in ${INCSGROUPS}
.if defined(${group}) && !empty(${group})
${group}OWN?= ${BINOWN}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
