5 files changed, 49 insertions, 22 deletions
diff --git a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
index 01f148e3eda..7b29b1d411e 100644
--- a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
@@ -1,16 +1,18 @@
-#	$OpenBSD: Makefile,v 1.9 2000/05/25 21:54:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2000/05/26 11:50:45 deraadt Exp $
 
+MAN3	=	keycap.3
+MAN5	=	keycap.5
+MLINKS	=	keycap.3 kgetent.3 keycap.3 kgetnum.3 keycap.3 kgetflag.3 \
+		keycap.3 kgetstr.3
+MANSUBDIR=/i386
+
+.if ${MACHINE} == "i386"
 LIB	=	keycap
 CAPDIR	=	/usr/share/misc
 CAPPATH	=	$(CAPDIR)/keycap.pcvt
 KEYCAPSRC=	keycap.src
 CFLAGS	+=	-DKEYCAP_PATH=\"$(CAPPATH)\"
 SRCS	=	keycap.c
-MAN3	=	keycap.3
-MAN5	=	keycap.5
-MLINKS	=	keycap.3 kgetent.3 keycap.3 kgetnum.3 keycap.3 kgetflag.3 \
-		keycap.3 kgetstr.3
-MANSUBDIR=/i386
 
 beforeinstall:
 	-@if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
@@ -18,5 +20,9 @@ beforeinstall:
 	fi
 	install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
 	    ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH}
-
 .include <bsd.lib.mk>
+.else
+NOPROG=
+.include <bsd.prog.mk>
+.endif
+
diff --git a/sys/arch/i386/stand/Makefile b/sys/arch/i386/stand/Makefile
index 25032315e27..39b4cf84517 100644
--- a/sys/arch/i386/stand/Makefile
+++ b/sys/arch/i386/stand/Makefile
@@ -1,6 +1,9 @@
-#	$OpenBSD: Makefile,v 1.8 1998/02/24 22:06:36 weingart Exp $
+#	$OpenBSD: Makefile,v 1.9 2000/05/26 11:50:46 deraadt Exp $
 
-SUBDIR=	etc libsa libz biosboot installboot boot mbr
+.if ${MACHINE} == "i386"
+SUBDIR=	etc libsa libz mbr
+.endif
+SUBDIR+= biosboot installboot boot
 
 test-fd0:
 	sudo mount /dev/fd0a /mnt
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index d628bad8d43..c28470c4086 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,12 +1,14 @@
-#	$OpenBSD: Makefile,v 1.18 1999/07/09 21:13:39 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.19 2000/05/26 11:50:46 deraadt Exp $
 
+MAN=	biosboot.8
+MANSUBDIR=/i386
+
+.if ${MACHINE} == "i386"
 PROG=	biosboot
 SRCS=	biosboot.S
 LD=ld
 LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic
 INSTALL_STRIP=
-MAN=	biosboot.8
-MANSUBDIR=/i386
 SADIR=	${.CURDIR}/..
 
 ${PROG}: $(OBJS) $(DPADD)
@@ -14,8 +16,12 @@ ${PROG}: $(OBJS) $(DPADD)
 	$(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDADD)
 	@size $(PROG)
 
-.include <bsd.prog.mk>
-
 CPPFLAGS+=-DLOADADDR=$(LOADADDR) -DBOOTMAGIC=$(BOOTMAGIC)
 CPPFLAGS+=${DEBUGFLAGS}
 #AFLAGS+=-Wa,-a
+.else
+NOPROG=
+.endif
+
+.include <bsd.prog.mk>
+
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 54c718eea09..b54ad5086c5 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,7 +1,12 @@
-#	$OpenBSD: Makefile,v 1.26 2000/05/25 21:54:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.27 2000/05/26 11:50:46 deraadt Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
+MAN=	boot.8
+MANSUBDIR=/i386
+MLINKS=	boot.8 boot.conf.8
+
+.if ${MACHINE} == "i386"
 PROG=	boot
 LD?=	ld
 SIZE?=	size
@@ -17,9 +22,6 @@ SRCS=	srt0.S
 .endif
 
 SRCS+=	boot.c cmd.c vars.c bootarg.c conf.c
-MAN=	boot.8
-MANSUBDIR=/i386
-MLINKS=	boot.8 boot.conf.8
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
@@ -32,9 +34,14 @@ ${PROG}: $(OBJS) $(DPADD)
 	$(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDADD)
 	@$(SIZE) $(PROG)
 
-.include <bsd.prog.mk>
-
 CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
 CFLAGS+=$(SACFLAGS)
 #AFLAGS+=-Wa,-R
 # AFLAGS+=-Wa,-a
+.else
+NOPROG=
+.endif
+
+.include <bsd.prog.mk>
+
+
diff --git a/sys/arch/i386/stand/installboot/Makefile b/sys/arch/i386/stand/installboot/Makefile
index 5a00aa2a871..f2e05dd9840 100644
--- a/sys/arch/i386/stand/installboot/Makefile
+++ b/sys/arch/i386/stand/installboot/Makefile
@@ -1,14 +1,19 @@
-#	$OpenBSD: Makefile,v 1.7 2000/05/25 21:55:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2000/05/26 11:50:46 deraadt Exp $
 
-PROG=	installboot
 MAN=	installboot.8
 MANSUBDIR=/i386
 
+.if ${MACHINE} == "i386"
+PROG=	installboot
+
 LDADD=	-lutil
 DPADD=	${LIBUTIL}
 # Need this to work in the miniroot
 LDSTATIC=	-static
 
 SADIR=	${.CURDIR}/..
+.else
+NOPROG=
+.endif
 
 .include <bsd.prog.mk>