From 341840a7b11a3efd912a15c96646477e11d6c431 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 13 May 2016 09:31:40 +0000 Subject: [PATCH] MFC r299162,r299163: r299162: Only install NIS section 8 manpages if MK_NIS != no r299163: Fix r299162 share/man/man8/Makefile: - Add src.opts.mk so MK_NIS can be tested - Fix typo in MK_NIS conditional tools/build/mk/OptionalObsoleteFiles.inc: - Remove WIP diff from ^/user/ngie/detangle-rc git-svn-id: svn://svn.freebsd.org/base/stable/10@299643 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- share/man/man8/Makefile | 8 +++++++- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 2b803b629..3aed6f8ee 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ +.include + MAN= crash.8 \ diskless.8 \ intro.8 \ @@ -11,7 +13,6 @@ MAN= crash.8 \ rc.subr.8 \ rescue.8 \ ${_uefi.8} \ - yp.8 MLINKS= rc.8 rc.atm.8 \ rc.8 rc.d.8 \ @@ -21,9 +22,14 @@ MLINKS= rc.8 rc.atm.8 \ rc.8 rc.pccard.8 \ rc.8 rc.serial.8 \ rc.8 rc.shutdown.8 + +.if ${MK_NIS} != "no" +MAN+= yp.8 + MLINKS+=yp.8 NIS.8 \ yp.8 nis.8 \ yp.8 YP.8 +.endif .if ${MACHINE_CPUARCH} == "amd64" _uefi.8= uefi.8 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 405e9e2a3..b29dc1564 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3662,6 +3662,10 @@ OLD_FILES+=usr/share/man/man5/netid.5.gz OLD_FILES+=usr/share/man/man8/mknetid.8.gz OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz +OLD_FILES+=usr/share/man/man8/NIS.8.gz +OLD_FILES+=usr/share/man/man8/YP.8.gz +OLD_FILES+=usr/share/man/man8/yp.8.gz +OLD_FILES+=usr/share/man/man8/nis.8.gz OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz OLD_FILES+=usr/share/man/man8/ypbind.8.gz OLD_FILES+=usr/share/man/man8/ypinit.8.gz -- 2.45.0