3 files changed, 31 insertions, 37 deletions
diff --git a/lib/libarch/Makefile b/lib/libarch/Makefile
index 651b63c32d1..58a282e6629 100644
--- a/lib/libarch/Makefile
+++ b/lib/libarch/Makefile
@@ -1,8 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 1996/11/13 03:55:41 etheisen Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/07/12 22:22:43 deraadt Exp $
 #	$NetBSD: Makefile,v 1.8 1996/02/21 02:43:52 jtk Exp $
 
-.if exists(${MACHINE}/Makefile)
-SUBDIR+= ${MACHINE}
-.endif
+SUBDIR=	alpha i386
 
 .include <bsd.subdir.mk>
diff --git a/lib/libarch/alpha/Makefile b/lib/libarch/alpha/Makefile
index 1e6585314f6..0b116bd6c74 100644
--- a/lib/libarch/alpha/Makefile
+++ b/lib/libarch/alpha/Makefile
@@ -1,30 +1,24 @@
 # $FreeBSD: src/lib/libio/Makefile,v 1.2 1999/08/28 00:04:42 peter Exp $
-# $OpenBSD: Makefile,v 1.5 2002/07/07 14:24:04 matthieu Exp $
-
-NOPIC=
-SRCS=		io.c bwx.c
-
-CFLAGS+= 	-Wall -Wno-uninitialized -Wa,-mev56
+# $OpenBSD: Makefile,v 1.6 2002/07/12 22:22:43 deraadt Exp $
 
 MAN=		libalpha.2
-
-MLINKS+=	libalpha.2 dense_base.2 \
-		libalpha.2 inb.2 \
-		libalpha.2 inl.2 \
-		libalpha.2 inw.2 \
-		libalpha.2 ioperm.2 \
-		libalpha.2 map_memory.2 \
-		libalpha.2 outb.2 \
-		libalpha.2 outl.2 \
-		libalpha.2 outw.2 \
-		libalpha.2 readb.2 \
-		libalpha.2 readl.2 \
-		libalpha.2 readw.2 \
-		libalpha.2 unmap_memory.2 \
-		libalpha.2 writeb.2 \
-		libalpha.2 writel.2 \
-		libalpha.2 writew.2
-
+MLINKS+=	libalpha.2 dense_base.2 libalpha.2 inb.2 \
+		libalpha.2 inl.2 libalpha.2 inw.2 \
+		libalpha.2 ioperm.2 libalpha.2 map_memory.2 \
+		libalpha.2 outb.2 libalpha.2 outl.2 \
+		libalpha.2 outw.2 libalpha.2 readb.2 \
+		libalpha.2 readl.2 libalpha.2 readw.2 \
+		libalpha.2 unmap_memory.2 libalpha.2 writeb.2 \
+		libalpha.2 writel.2 libalpha.2 writew.2
 MANSUBDIR=alpha
 
+.if ${MACHINE} == "alpha"
+NOPIC=
+SRCS=		io.c bwx.c
+CFLAGS+= 	-Wall -Wno-uninitialized -Wa,-mev56
 .include <bsd.lib.mk>
+.else
+NOPROG=
+.include <bsd.prog.mk>
+.endif
+
diff --git a/lib/libarch/i386/Makefile b/lib/libarch/i386/Makefile
index 34ab8c7dbd1..64177d0b7bd 100644
--- a/lib/libarch/i386/Makefile
+++ b/lib/libarch/i386/Makefile
@@ -1,20 +1,22 @@
-#	$OpenBSD: Makefile,v 1.3 2000/01/01 10:02:07 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/07/12 22:22:43 deraadt Exp $
 #	$NetBSD: Makefile,v 1.1 1996/02/21 02:45:47 jtk Exp $
 
-.PATH: ${LIBC}/i386
-NOPIC=
-
-SRCS+=	i386_get_ldt.c i386_set_ldt.c \
-	i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
-	i386_vm86.c
-
 MAN+=	i386_get_ldt.2 \
 	i386_iopl.2 i386_get_ioperm.2 \
 	i386_vm86.2
-
 MANSUBDIR=/i386
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 \
 	i386_get_ioperm.2 i386_set_ioperm.2
 
+.if ${MACHINE} == "i386"
+.PATH: ${LIBC}/i386
+NOPIC=
+SRCS+=	i386_get_ldt.c i386_set_ldt.c \
+	i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
+	i386_vm86.c
 .include <bsd.lib.mk>
+.else
+NOPROG=
+.include <bsd.prog.mk>
+.endif