diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-30 12:50:25 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-30 12:50:25 -0500 |
| commit | cda345b593ec84d7abbf45b2ce284a9d7f53307c (patch) | |
| tree | 7ad875acd35d7cd5a18a7676761b35e5385b1b0c /share | |
| parent | c35924db4e1edd83f5a845760098fc8cbd7f7456 (diff) | |
| parent | f08e8e5dd415880269fb4ce4cb2fd7bccefe336d (diff) | |
| download | FreeBSD-src-cda345b593ec84d7abbf45b2ce284a9d7f53307c.zip FreeBSD-src-cda345b593ec84d7abbf45b2ce284a9d7f53307c.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man4/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.files.mk | 6 | ||||
| -rw-r--r-- | share/mk/bsd.incs.mk | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index c4a571b..2c3f632 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -580,7 +580,9 @@ MLINKS+=cfi.4 cfid.4 MLINKS+=crypto.4 cryptodev.4 MLINKS+=cue.4 if_cue.4 MLINKS+=cxgb.4 if_cxgb.4 -MLINKS+=cxgbe.4 if_cxgbe.4 +MLINKS+=cxgbe.4 if_cxgbe.4 \ + cxgbe.4 cxl.4 \ + cxgbe.4 if_cxl.4 MLINKS+=dc.4 if_dc.4 MLINKS+=de.4 if_de.4 MLINKS+=disc.4 if_disc.4 diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index 4178fbc..2aa5528 100644 --- 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 index 74c378b..1b5f17f 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -8,8 +8,10 @@ INCSGROUPS?= INCS +_INCSGROUPS= ${INCSGROUPS:C,[/*],_,g} + .if !target(buildincludes) -.for group in ${INCSGROUPS} +.for group in ${_INCSGROUPS} buildincludes: ${${group}} .endfor .endif @@ -17,7 +19,7 @@ buildincludes: ${${group}} all: buildincludes .if !target(installincludes) -.for group in ${INCSGROUPS} +.for group in ${_INCSGROUPS} .if defined(${group}) && !empty(${group}) ${group}OWN?= ${BINOWN} |
