diff options
author | ngie <ngie@FreeBSD.org> | 2015-11-10 13:28:41 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-11-10 13:28:41 +0000 |
commit | 8bc9b090d8f6c576fd02b07b642dd6360652b6dc (patch) | |
tree | 84126cbba6b668ebbca5a3fb216c42c381642fc3 | |
parent | e532fa1afbf597eeea904cc2c5475cee3982afa5 (diff) | |
download | FreeBSD-src-8bc9b090d8f6c576fd02b07b642dd6360652b6dc.zip FreeBSD-src-8bc9b090d8f6c576fd02b07b642dd6360652b6dc.tar.gz |
- Move ng_bluetooth.4 under MK_BLUETOOTH != no
- Move all section 5 bluetooth manpages under MK_BLUETOOTH != no
MFC after: 3 days
PR: 193260
Reported by: Philippe Michel <philippe.michel7@sfr.fr>
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | share/man/man4/Makefile | 5 | ||||
-rw-r--r-- | share/man/man5/Makefile | 9 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 68862e5..0650d9d 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -311,7 +311,6 @@ MAN= aac.4 \ ng_atm.4 \ ngatmbase.4 \ ng_atmllc.4 \ - ng_bluetooth.4 \ ng_bpf.4 \ ng_bridge.4 \ ng_bt3c.4 \ @@ -821,6 +820,10 @@ _bhyve.4= bhyve.4 .endif .endif +.if ${MK_BLUETOOTH} != "no" +MAN+= ng_bluetooth.4 +.endif + .if ${MACHINE_CPUARCH} == "mips" _nvram2env.4= nvram2env.4 .endif diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 1f01a0b..1ead7c6 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -7,9 +7,6 @@ MAN= acct.5 \ ar.5 \ a.out.5 \ - bluetooth.device.conf.5 \ - bluetooth.hosts.5 \ - bluetooth.protocols.5 \ ${_boot.config.5} \ core.5 \ devfs.5 \ @@ -84,6 +81,12 @@ MLINKS+=src.conf.5 src-env.conf.5 MAN+= autofs.5 .endif +.if ${MK_BLUETOOTH} != "no" +MAN+= bluetooth.device.conf.5 \ + bluetooth.hosts.5 \ + bluetooth.protocols.5 +.endif + .if ${MK_FREEBSD_UPDATE} != "no" MAN+= freebsd-update.conf.5 .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e74dde9..00001cd 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -517,6 +517,10 @@ OLD_FILES+=usr/share/man/man3/sdp_register_service.3.gz OLD_FILES+=usr/share/man/man3/sdp_search.3.gz OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz +OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz +OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz +OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz +OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz OLD_FILES+=usr/share/man/man8/bcmfw.8.gz |