summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2017-01-03 23:22:48 +0000
committerbdrewery <bdrewery@FreeBSD.org>2017-01-03 23:22:48 +0000
commit5b83d7e613835e2ecad6c5d93d81181f484f3042 (patch)
treede6ad8a95623cc0998f56e473c1cd169f217d306 /share
parent8089349b68bf5fdcb82ab3f450d4d6266dea424f (diff)
downloadFreeBSD-src-5b83d7e613835e2ecad6c5d93d81181f484f3042.zip
FreeBSD-src-5b83d7e613835e2ecad6c5d93d81181f484f3042.tar.gz
MFC r309477:
Revert r296585.
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.confs.mk6
-rw-r--r--share/mk/bsd.files.mk6
-rw-r--r--share/mk/bsd.incs.mk6
3 files changed, 6 insertions, 12 deletions
diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk
index 6fe2ad2..20a9782 100644
--- a/share/mk/bsd.confs.mk
+++ b/share/mk/bsd.confs.mk
@@ -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}
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index b84cd84..2ba951e 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -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}
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index c5c852a..cd3e583 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -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}
OpenPOWER on IntegriCloud