Author: ngie
Date: Fri May 13 09:33:48 2016
New Revision: 299645
URL: https://svnweb.freebsd.org/changeset/base/299645
Log:
MFstable/10 r299643:
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
Modified:
stable/9/share/man/man8/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/share/ (props changed)
stable/9/share/man/ (props changed)
stable/9/share/man/man8/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/share/man/man8/Makefile
==============================================================================
--- stable/9/share/man/man8/Makefile Fri May 13 09:32:05 2016
(r299644)
+++ stable/9/share/man/man8/Makefile Fri May 13 09:33:48 2016
(r299645)
@@ -1,6 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+.include <bsd.own.mk>
+
MAN= crash.8 \
diskless.8 \
intro.8 \
@@ -10,7 +12,6 @@ MAN= crash.8 \
rc.sendmail.8 \
rc.subr.8 \
rescue.8 \
- yp.8
MLINKS= rc.8 rc.atm.8 \
rc.8 rc.d.8 \
@@ -20,8 +21,13 @@ 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
.include <bsd.prog.mk>
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri May 13 09:32:05
2016 (r299644)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri May 13 09:33:48
2016 (r299645)
@@ -3256,6 +3256,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
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
