Conditionally install (if_)?(otus|rsu).4, otusfw.4, rsufw.4, and urtwn.4 if

MK_USB != no

Add the manpages to OptionalObsoleteFiles.inc

As a side-effect, this also fixes installworld with MK_USB == no

X-MFC with: r290128
Sponsored by: EMC / Isilon Storage Division

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index cfb66468ca479f67a7664b3184884b3cd4900ce3..68862e5d64ed411207a01f8590e3554fa0e81c9a 100644 (file)
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -379,8 +379,6 @@ MAN=        aac.4 \
        oce.4 \
        ohci.4 \
        orm.4 \
-       otus.4 \
-       otusfw.4 \
        ow.4 \
        ow_temp.4 \
        owc.4 \
@@ -425,8 +423,6 @@ MAN=        aac.4 \
        rndtest.4 \
        route.4 \
        rp.4 \
-       rsu.4 \
-       rsufw.4 \
        rue.4 \
        rum.4 \
        run.4 \
@@ -672,7 +668,6 @@ MLINKS+=nge.4 if_nge.4
 MLINKS+=${_ntb.4} ${_if_ntb.4} \
        ${_ntb.4} ${_ntb_hw.4}
 MLINKS+=${_nxge.4} ${_if_nxge.4}
-MLINKS+=otus.4 if_otus.4
 MLINKS+=ow.4 onewire.4
 MLINKS+=patm.4 if_patm.4
 MLINKS+=pccbb.4 cbb.4
@@ -686,7 +681,6 @@ MLINKS+=rl.4 if_rl.4
 MLINKS+=rue.4 if_rue.4
 MLINKS+=rum.4 if_rum.4
 MLINKS+=run.4 if_run.4
-MLINKS+=rsu.4 if_rsu.4
 MLINKS+=scsi.4 CAM.4 \
        scsi.4 cam.4 \
        scsi.4 scbus.4 \
@@ -715,7 +709,6 @@ MLINKS+=tl.4 if_tl.4
 MLINKS+=tun.4 if_tun.4
 MLINKS+=tx.4 if_tx.4
 MLINKS+=txp.4 if_txp.4
-MLINKS+=urtwn.4 if_urtwn.4
 MLINKS+=vge.4 if_vge.4
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vxlan.4 if_vxlan.4
@@ -869,6 +862,10 @@ _pfsync.4= pfsync.4
 
 .if ${MK_USB} != "no"
 MAN+=  \
+       otus.4 \
+       otusfw.4 \
+       rsu.4 \
+       rsufw.4 \
        u3g.4 \
        uark.4 \
        uart.4 \
@@ -922,6 +919,8 @@ MAN+=       \
        uvisor.4 \
        uvscom.4 \
 
+MLINKS+=otus.4 if_otus.4
+MLINKS+=rsu.4 if_rsu.4
 MLINKS+=u3g.4 u3gstub.4
 MLINKS+=uath.4 if_uath.4
 MLINKS+=udav.4 if_udav.4
@@ -929,6 +928,7 @@ MLINKS+=upgt.4 if_upgt.4
 MLINKS+=ural.4 if_ural.4
 MLINKS+=urndis.4 if_urndis.4
 MLINKS+=${_urtw.4} ${_if_urtw.4}
+MLINKS+=urtwn.4 if_urtwn.4
 .endif
 
 .include <bsd.prog.mk>

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 027e5a000279785683833b3fa59063036793cdf9..50fd4ed244bd8db550a8ca6686a154be1d09afd8 100644 (file)
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -8029,6 +8029,12 @@ OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/usbhid.3.gz
+OLD_FILES+=usr/share/man/man4/if_otus.4.gz
+OLD_FILES+=usr/share/man/man4/if_rsu.4.gz
+OLD_FILES+=usr/share/man/man4/otus.4.gz
+OLD_FILES+=usr/share/man/man4/otusfw.4.gz
+OLD_FILES+=usr/share/man/man4/rsu.4.gz
+OLD_FILES+=usr/share/man/man4/rsufw.4.gz
 OLD_FILES+=usr/share/man/man4/u3g.4.gz
 OLD_FILES+=usr/share/man/man4/u3gstub.4.gz
 OLD_FILES+=usr/share/man/man4/uark.4.gz