From 5250bfb8bce969e3b3bfc3c0b9d4d7f32896031e Mon Sep 17 00:00:00 2001 From: Gary Mills Date: Thu, 10 May 2018 07:38:08 -0500 Subject: [PATCH] 9528 Loader man pages should only be installed for x86 Reviewed by: Yuri Pankov Approved by: Hans Rosenfeld --- usr/src/man/man4/Makefile | 5 +++-- usr/src/man/man5/Makefile | 32 +++++++++++++++++++------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/usr/src/man/man4/Makefile b/usr/src/man/man4/Makefile index d10620939b..fd60281537 100644 --- a/usr/src/man/man4/Makefile +++ b/usr/src/man/man4/Makefile @@ -13,6 +13,7 @@ # Copyright 2011, Richard Lowe # Copyright 2015, Joyent, Inc. # Copyright 2016 Nexenta Systems, Inc. +# Copyright 2018 Gary Mills # include $(SRC)/Makefile.master @@ -100,7 +101,6 @@ _MANFILES= Intro.4 \ ldapfilter.conf.4 \ ldapsearchprefs.conf.4 \ ldaptemplates.conf.4 \ - loader.conf.4 \ logadm.conf.4 \ logindevperm.4 \ loginlog.4 \ @@ -205,7 +205,8 @@ _MANFILES= Intro.4 \ sparc_MANFILES= sbus.4 -i386_MANFILES= sysbus.4 +i386_MANFILES= loader.conf.4 \ + sysbus.4 _MANLINKS= addresses.4 \ devid_cache.4 \ diff --git a/usr/src/man/man5/Makefile b/usr/src/man/man5/Makefile index 935cc2afa8..481c84a64d 100644 --- a/usr/src/man/man5/Makefile +++ b/usr/src/man/man5/Makefile @@ -15,13 +15,14 @@ # Copyright 2014 Nexenta Systems, Inc. # Copyright 2014 Garrett D'Amore # Copyright (c) 2015, Joyent, Inc. All rights reserved. +# Copyright 2018 Gary Mills # include $(SRC)/Makefile.master MANSECT= 5 -MANFILES= Intro.5 \ +_MANFILES= Intro.5 \ acl.5 \ ad.5 \ ascii.5 \ @@ -29,21 +30,17 @@ MANFILES= Intro.5 \ audit_binfile.5 \ audit_remote.5 \ audit_syslog.5 \ - brand.4th.5 \ brands.5 \ byteorder.5 \ cancellation.5 \ charmap.5 \ - check-password.4th.5 \ condition.5 \ - color.4th.5 \ crypt_bsdbf.5 \ crypt_bsdmd5.5 \ crypt_sha256.5 \ crypt_sha512.5 \ crypt_sunmd5.5 \ crypt_unix.5 \ - delay.4th.5 \ device_clean.5 \ dhcp.5 \ environ.5 \ @@ -56,7 +53,6 @@ MANFILES= Intro.5 \ fnmatch.5 \ formats.5 \ fsattr.5 \ - gptzfsboot.5 \ grub.5 \ gss_auth_rules.5 \ hal.5 \ @@ -73,8 +69,6 @@ MANFILES= Intro.5 \ lf64.5 \ lfcompile.5 \ lfcompile64.5 \ - loader.5 \ - loader.4th.5 \ locale.5 \ man.5 \ mandoc_char.5 \ @@ -83,8 +77,6 @@ MANFILES= Intro.5 \ mdoc.5 \ me.5 \ mech_spnego.5 \ - menu.4th.5 \ - menusets.4th.5 \ mm.5 \ ms.5 \ mutex.5 \ @@ -117,7 +109,6 @@ MANFILES= Intro.5 \ pkcs11_tpm.5 \ privileges.5 \ prof.5 \ - pxeboot.5 \ rbac.5 \ regex.5 \ regexp.5 \ @@ -137,12 +128,25 @@ MANFILES= Intro.5 \ threads.5 \ timerfd.5 \ trusted_extensions.5 \ - version.4th.5 \ vgrindefs.5 \ - zfsloader.5 \ zones.5 \ zpool-features.5 +sparc_MANFILES= + +i386_MANFILES= brand.4th.5 \ + check-password.4th.5 \ + color.4th.5 \ + delay.4th.5 \ + gptzfsboot.5 \ + loader.5 \ + loader.4th.5 \ + menu.4th.5 \ + menusets.4th.5 \ + pxeboot.5 \ + version.4th.5 \ + zfsloader.5 + MANLINKS= ANSI.5 \ C++.5 \ C.5 \ @@ -177,6 +181,8 @@ MANLINKS= ANSI.5 \ step.5 \ teclarc.5 +MANFILES= $(_MANFILES) $($(MACH)_MANFILES) + intro.5 := LINKSRC = Intro.5 CSI.5 := LINKSRC = attributes.5 -- 2.11.4.GIT