Install apm(8) and and apmd(8) under MI MANPATH

powerpc64 was lacking manual pages;  instead of shipping yet another
identical MD manual, merge them under MI MANPATH as usual.

Input OK deraadt

3 files changed, 4 insertions, 16 deletions

diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 7621756b34b..e5620b001c4 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2296,8 +2296,6 @@
 ./usr/share/man/man8/alpha/setnetbootinfo.8
 ./usr/share/man/man8/amd.8
 ./usr/share/man/man8/amd64/MAKEDEV.8
-./usr/share/man/man8/amd64/apm.8
-./usr/share/man/man8/amd64/apmd.8
 ./usr/share/man/man8/amd64/biosboot.8
 ./usr/share/man/man8/amd64/boot.8
 ./usr/share/man/man8/amd64/boot_amd64.8
@@ -2307,9 +2305,9 @@
 ./usr/share/man/man8/amd64/memconfig.8
 ./usr/share/man/man8/amd64/pxeboot.8
 ./usr/share/man/man8/amq.8
+./usr/share/man/man8/apm.8
+./usr/share/man/man8/apmd.8
 ./usr/share/man/man8/arm64/MAKEDEV.8
-./usr/share/man/man8/arm64/apm.8
-./usr/share/man/man8/arm64/apmd.8
 ./usr/share/man/man8/arm64/eeprom.8
 ./usr/share/man/man8/arm64/gpioctl.8
 ./usr/share/man/man8/armv7/MAKEDEV.8
@@ -2383,8 +2381,6 @@
 ./usr/share/man/man8/hppa/mkboot.8
 ./usr/share/man/man8/httpd.8
 ./usr/share/man/man8/i386/MAKEDEV.8
-./usr/share/man/man8/i386/apm.8
-./usr/share/man/man8/i386/apmd.8
 ./usr/share/man/man8/i386/biosboot.8
 ./usr/share/man/man8/i386/boot.8
 ./usr/share/man/man8/i386/boot_i386.8
@@ -2431,15 +2427,11 @@
 ./usr/share/man/man8/login_token.8
 ./usr/share/man/man8/login_yubikey.8
 ./usr/share/man/man8/loongson/MAKEDEV.8
-./usr/share/man/man8/loongson/apm.8
-./usr/share/man/man8/loongson/apmd.8
 ./usr/share/man/man8/lpc.8
 ./usr/share/man/man8/lpd.8
 ./usr/share/man/man8/luna88k/MAKEDEV.8
 ./usr/share/man/man8/luna88k/boot_luna88k.8
 ./usr/share/man/man8/macppc/MAKEDEV.8
-./usr/share/man/man8/macppc/apm.8
-./usr/share/man/man8/macppc/apmd.8
 ./usr/share/man/man8/macppc/boot.8
 ./usr/share/man/man8/macppc/boot_macppc.8
 ./usr/share/man/man8/macppc/eeprom.8
@@ -2583,8 +2575,6 @@
 ./usr/share/man/man8/spamdb.8
 ./usr/share/man/man8/spamlogd.8
 ./usr/share/man/man8/sparc64/MAKEDEV.8
-./usr/share/man/man8/sparc64/apm.8
-./usr/share/man/man8/sparc64/apmd.8
 ./usr/share/man/man8/sparc64/boot_sparc64.8
 ./usr/share/man/man8/sparc64/eeprom.8
 ./usr/share/man/man8/sparc64/ldomctl.8
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index d30f1cb0143..a6d5a35ed5d 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2020/07/15 22:46:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.20 2021/03/29 20:10:30 kn Exp $
 
 
 .if ((${MACHINE} == "arm64") || (${MACHINE} == "amd64") || \
@@ -19,6 +19,5 @@ NOPROG=yes
 .endif
 
 MAN=	apm.8
-MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 77fc5ea88c8..6ee133773ad 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2020/07/15 22:46:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.16 2021/03/29 20:10:30 kn Exp $
 
 .if ((${MACHINE} == "arm64") || (${MACHINE} == "amd64") || \
     (${MACHINE} == "i386") || (${MACHINE} == "loongson") || \
@@ -13,6 +13,5 @@ NOPROG=yes
 .endif
 
 MAN=	apmd.8
-MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64
 
 .include <bsd.prog.mk>