Prepare to recurse down those directories for all arches, to grab manpages.

4 files changed, 31 insertions, 9 deletions

diff --git a/sbin/ancontrol/Makefile b/sbin/ancontrol/Makefile
index 6f744e8e858..e274e099960 100644
--- a/sbin/ancontrol/Makefile
+++ b/sbin/ancontrol/Makefile
@@ -1,7 +1,12 @@
-#	$OpenBSD: Makefile,v 1.1 2000/04/03 01:08:09 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 2000/05/18 13:49:49 espie Exp $
 
+.if ${MACHINE}=="i386"
 PROG=	ancontrol
-MAN=	ancontrol.8
 CFLAGS+=-DANCACHE
+.else
+NOPROG=yes
+.endif
 
+MAN=	ancontrol.8
+MANSUBDIR=i386
 .include <bsd.prog.mk>
diff --git a/sbin/edlabel/Makefile b/sbin/edlabel/Makefile
index e211f29c1b5..da81b4889d3 100644
--- a/sbin/edlabel/Makefile
+++ b/sbin/edlabel/Makefile
@@ -1,11 +1,17 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:36:26 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2000/05/18 13:49:52 espie Exp $
 
+.if ${MACHINE} == "sun3" || ${MACHINE} == "atari" || ${MACHINE} == "sparc"
 PROG=	edlabel
-NOMAN=
 CFLAGS+= -Wall
 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 
 all: ${PROG}
+.else
+NOPROG=yes
+.endif
+
+NOMAN=
+MANSUBDIR=sun3 sparc #atari
 
 .include <bsd.prog.mk>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 340f46ac599..c41b4a95bb2 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile,v 1.11 1998/05/16 17:33:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.12 2000/05/18 13:49:51 espie Exp $
 #
 # Copyright (c) 1997 Tobias Weingartner
 # All rights reserved.
@@ -30,16 +30,22 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+.if ${MACHINE} == "i386" || ${MACHINE} == "arc" || ${MACHINE} == "powerpc" || ${MACHINE} == "alpha"
 PROG=	fdisk 
 SRCS=	fdisk.c user.c misc.c disk.c mbr.c part.c cmd.c manual.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-MAN=	fdisk.8
-
 CLEANFILES+=manual.c
+
 manual.c:	fdisk.8
 	(echo 'char manpage[] = "\\'; \
 	nroff -mandoc ${.CURDIR}/fdisk.8 | sed -e 's/$$/\\n\\/'; \
 	echo '";' ) > manual.c
+.else
+NOPROG=yes
+.endif
+
+MAN=	fdisk.8
+MANSUBDIR=i386 arc powerpc alpha
 
 .include <bsd.prog.mk>
diff --git a/sbin/wicontrol/Makefile b/sbin/wicontrol/Makefile
index 67092ac524b..3ca45ec40a4 100644
--- a/sbin/wicontrol/Makefile
+++ b/sbin/wicontrol/Makefile
@@ -1,11 +1,16 @@
-#	$OpenBSD: Makefile,v 1.1 1999/07/11 16:31:08 niklas Exp $
+#	$OpenBSD: Makefile,v 1.2 2000/05/18 13:49:51 espie Exp $
 #	From: Makefile,v 1.1 1999/05/05 07:37:06 wpaul Exp $
+
+.if ${MACHINE} == "i386"
 PROG=	wicontrol
 SRCS=	wicontrol.c
 
 CFLAGS+= -Wall
+.else
+NOPROG=yes
+.endif
 
-#MAN8=	wicontrol.8
 MAN=	wicontrol.8
+MANSUBDIR=i386
 
 .include <bsd.prog.mk>