MFC r296585:

These group names may be used as a cookie, so replace any non-fs-safe characters.
HardenedBSD · Mar 28, 2016 · 4030fbd · 4030fbd
1 parent 047bc66
commit 4030fbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
@@ -9,13 +9,15 @@ __<bsd.files.mk>__:
 
 FILESGROUPS?=	FILES
 
-.for group in ${FILESGROUPS}
+_FILESGROUPS=	${FILESGROUPS:C,[/*],_,g}
+
+.for group in ${_FILESGROUPS}
 buildfiles: ${${group}}
 .endfor
 
 all: buildfiles
 
-.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
@@ -8,16 +8,18 @@
 
 INCSGROUPS?=	INCS
 
+_INCSGROUPS=	${INCSGROUPS:C,[/*],_,g}
+
 .if !target(buildincludes)
-.for group in ${INCSGROUPS}
+.for group in ${_INCSGROUPS}
 buildincludes: ${${group}}
 .endfor
 .endif
 
 all: buildincludes
 
 .if !target(installincludes)
-.for group in ${INCSGROUPS}
+.for group in ${_INCSGROUPS}
 .if defined(${group}) && !empty(${group})
 
 ${group}OWN?=	${BINOWN}