diff --git a/gnu/usr.bin/gas/Makefile b/gnu/usr.bin/gas/Makefile
index 2efff4b6c04e..40a5fa362257 100644
--- a/gnu/usr.bin/gas/Makefile
+++ b/gnu/usr.bin/gas/Makefile
@@ -1,6 +1,12 @@
-#	$NetBSD: Makefile,v 1.21 1997/05/11 08:05:08 mikel Exp $
+#	$NetBSD: Makefile,v 1.22 1997/06/23 13:25:41 mrg Exp $
 #	@(#)Makefile	6.1 (Berkeley) 3/3/91
 
+
+.elif	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax")
 .if exists(config/Makefile.$(MACHINE_ARCH))
 .include "config/Makefile.$(MACHINE_ARCH)"
 .endif
@@ -70,4 +76,8 @@ targ-env.h: Makefile config/Makefile.$(MACHINE_ARCH)
 
 CLEANFILES+= ${CONF_HEADERS}
 
+.endif
+
+MAN=	as.1
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gcc/Makefile b/gnu/usr.bin/gcc/Makefile
index f929506672f7..a8308e304274 100644
--- a/gnu/usr.bin/gcc/Makefile
+++ b/gnu/usr.bin/gcc/Makefile
@@ -1,5 +1,15 @@
-#	$NetBSD: Makefile,v 1.1.1.1 1995/12/01 17:58:53 phil Exp $
+#	$NetBSD: Makefile,v 1.2 1997/06/23 13:25:43 mrg Exp $
 
-SUBDIR=	common cc cpp cc1 cc1plus cc1obj g++ libgcc libobjc
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32") || \
+	(${MACHINE_ARCH} == "mips") 
+SUBDIR=	common cc1 cc1plus cc1obj libgcc libobjc
+.endif
+
+SUBDIR=	cc cpp g++
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/gcc/cc/Makefile b/gnu/usr.bin/gcc/cc/Makefile
index 3c3cd2ef8808..0efe083fe929 100644
--- a/gnu/usr.bin/gcc/cc/Makefile
+++ b/gnu/usr.bin/gcc/cc/Makefile
@@ -1,9 +1,15 @@
 #	from: @(#)Makefile    6.2 (Berkeley) 3/25/91
-#	$NetBSD: Makefile,v 1.2 1997/03/24 22:06:17 christos Exp $
+#	$NetBSD: Makefile,v 1.3 1997/06/23 13:25:45 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32") || \
+	(${MACHINE_ARCH} == "mips") 
 PROG=           gcc
 SRCS=	gcc.c obstack.c version.c 
-MAN=		gcc.1
 BINDIR=		/usr/bin
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \
 	-I${.CURDIR}/../arch/$(MACHINE_ARCH) \
@@ -14,8 +20,11 @@ LDADD+=		-lgnumalloc
 DPADD+=		${LIBGNUMALLOC}
 
 LINKS+=		${BINDIR}/gcc ${BINDIR}/cc 
-MLINKS=		gcc.1 cc.1
 
 .PATH:		$(.CURDIR)/../common 
+.endif
+
+MAN=		gcc.1
+MLINKS=		gcc.1 cc.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gcc/cpp/Makefile b/gnu/usr.bin/gcc/cpp/Makefile
index f7b68b9f1d19..38d420ec4ae7 100644
--- a/gnu/usr.bin/gcc/cpp/Makefile
+++ b/gnu/usr.bin/gcc/cpp/Makefile
@@ -1,6 +1,13 @@
 #	from: @(#)Makefile	6.4 (Berkeley) 2/21/91
-#	$NetBSD: Makefile,v 1.5 1997/05/13 21:02:00 phil Exp $
+#	$NetBSD: Makefile,v 1.6 1997/06/23 13:25:46 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32") || \
+	(${MACHINE_ARCH} == "mips") 
 PROG=	cpp
 BINDIR=	/usr/libexec
 SRCS=	cccp.c cexp.c obstack.c version.c 
@@ -13,11 +20,10 @@ LDADD+=	-lgnumalloc
 DPADD+=	${LIBGNUMALLOC}
 YFLAGS=
 
-MLINKS=	cpp.1 cccp.1 cpp.1 gcpp.1
-
 CLEANFILES+= cexp.c
 
 .PATH:		$(.CURDIR)/../common
+.endif
 
 LINKS=	/usr/bin/cpp /usr/bin/gcpp
 FILES=usr.bin.cpp.sh
@@ -25,4 +31,7 @@ FILESNAME=cpp
 FILESDIR=/usr/bin
 FILESMODE=${BINMODE}
 
+MAN=	cpp.1
+MLINKS=	cpp.1 cccp.1 cpp.1 gcpp.1
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gcc/g++/Makefile b/gnu/usr.bin/gcc/g++/Makefile
index 2dc51b72291b..34c0896816dc 100644
--- a/gnu/usr.bin/gcc/g++/Makefile
+++ b/gnu/usr.bin/gcc/g++/Makefile
@@ -1,9 +1,15 @@
 #	from: @(#)Makefile    6.2 (Berkeley) 3/25/91
-#	$NetBSD: Makefile,v 1.5 1997/05/13 21:02:01 phil Exp $
+#	$NetBSD: Makefile,v 1.6 1997/06/23 13:25:48 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32") || \
+	(${MACHINE_ARCH} == "mips") 
 PROG=	g++
 SRCS=	g++.c obstack.c version.c 
-MAN=	g++.1
 BINDIR=	/usr/bin
 CFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/../common \
 	-I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH) \
@@ -12,8 +18,11 @@ LDADD+=	-lgnumalloc
 DPADD+=	${LIBGNUMALLOC}
 
 LINKS+=	${BINDIR}/g++ ${BINDIR}/c++
-MLINKS=	g++.1 c++.1
 
 .PATH:          $(.CURDIR)/../common 
+.endif
+
+MAN=	g++.1
+MLINKS=	g++.1 c++.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index c599a2c5031d..70269cdbfddb 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -1,5 +1,13 @@
-#	$NetBSD: Makefile,v 1.7 1995/04/23 07:58:40 cgd Exp $
+#	$NetBSD: Makefile,v 1.8 1997/06/23 13:25:50 mrg Exp $
 
-SUBDIR=	bfd readline libiberty gdb
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax")
+SUBDIR=	bfd readline libiberty
+.endif
+
+SUBDIR=	gdb
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index ff75f3f82c3d..18909590f6c9 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,4 +1,10 @@
-# $Id: Makefile,v 1.12 1997/05/07 07:15:40 mycroft Exp $
+# $Id: Makefile,v 1.13 1997/06/23 13:25:52 mrg Exp $
+
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax")
 
 # Paths to libraries
 #
@@ -55,5 +61,10 @@ DPADD+=		$(LIBTERMCAP) $(LIBKVM)
 .if exists(arch/$(MACHINE_ARCH)/Makefile.inc)
 .include "arch/$(MACHINE_ARCH)/Makefile.inc"
 .endif
+
+.endif
+
+MAN=	gdb.1
+
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/ld/ld/Makefile b/gnu/usr.bin/ld/ld/Makefile
index 7d2a23dc8185..5af6923bdee6 100644
--- a/gnu/usr.bin/ld/ld/Makefile
+++ b/gnu/usr.bin/ld/ld/Makefile
@@ -1,9 +1,18 @@
-#	$NetBSD: Makefile,v 1.2 1997/04/19 17:09:53 christos Exp $
+#	$NetBSD: Makefile,v 1.3 1997/06/23 13:25:54 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ld
 SRCS=	ld.c symbol.c lib.c shlib.c warnings.c etc.c rrs.c xbits.c md.c
 LDADD+= -lgnumalloc
 DPADD+= /usr/lib/libgnumalloc.a
 BINDIR=/usr/bin
+.endif
+
+MAN=	ld.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/ld/ldconfig/Makefile b/gnu/usr.bin/ld/ldconfig/Makefile
index 77965a627fb5..aab616477658 100644
--- a/gnu/usr.bin/ld/ldconfig/Makefile
+++ b/gnu/usr.bin/ld/ldconfig/Makefile
@@ -1,9 +1,17 @@
-#	$NetBSD: Makefile,v 1.11 1997/04/16 16:49:42 christos Exp $
+#	$NetBSD: Makefile,v 1.12 1997/06/23 13:25:55 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ldconfig
 SRCS=	ldconfig.c shlib.c etc.c
 LDSTATIC=-static
 BINDIR=	/sbin
+.endif
+
 MAN=	ldconfig.8
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/ld/ldd/Makefile b/gnu/usr.bin/ld/ldd/Makefile
index c9a2958953d7..7b39e25ca54b 100644
--- a/gnu/usr.bin/ld/ldd/Makefile
+++ b/gnu/usr.bin/ld/ldd/Makefile
@@ -1,7 +1,16 @@
-#	$NetBSD: Makefile,v 1.5 1995/10/09 00:09:39 pk Exp $
+#	$NetBSD: Makefile,v 1.6 1997/06/23 13:25:57 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ldd
 SRCS=	ldd.c
 BINDIR= /usr/bin
+.endif
+
+MAN=	ldd.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 6e985ce1db88..0619d211b13c 100644
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,8 +1,13 @@
-#	$NetBSD: Makefile,v 1.19 1997/05/31 21:21:37 cjs Exp $
+#	$NetBSD: Makefile,v 1.20 1997/06/23 13:25:58 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
-MAN= rtld.1
 PICFLAG=-fpic -fno-function-cse
 CFLAGS+=$(PICFLAG) -DRTLD -DLIBC_SCCS
 ASFLAGS+=-k
@@ -14,7 +19,6 @@ LDADD+=	-lc_pic
 DPADD+=	${LIBC_PIC}
 BINDIR= /usr/libexec
 HDRS=	link.h
-MLINKS=	rtld.1 ld.so.1
 INCS=${HDRS}
 INCSDIR=/usr/include
 
@@ -25,5 +29,9 @@ $(PROG):
 
 .S.o:
 	${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
+.endif
+
+MAN= rtld.1
+MLINKS=	rtld.1 ld.so.1
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index 91e684decc8c..1deea42d2de9 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 1997/05/31 21:21:38 cjs Exp $
+#	$NetBSD: Makefile,v 1.11 1997/06/23 13:26:00 mrg Exp $
 
 # Define FSYNC_ALL to get slower but safer writes in case of crashes in
 # the middle of CVS/RCS changes
@@ -6,7 +6,7 @@ CFLAGS+=-DFSYNC_ALL
 
 # If you wish to use a different Id token in addition to Id,
 # uncomment the following line and edit to taste.
-#CFLAGS+=-DLOCALID=\"Foo\"
+CFLAGS+=-DLOCALID=\"eterna\"
 
 LIB=	rcs
 SRCS=	maketime.c merger.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
diff --git a/libexec/ld.aout_so/Makefile b/libexec/ld.aout_so/Makefile
index 6e985ce1db88..0619d211b13c 100644
--- a/libexec/ld.aout_so/Makefile
+++ b/libexec/ld.aout_so/Makefile
@@ -1,8 +1,13 @@
-#	$NetBSD: Makefile,v 1.19 1997/05/31 21:21:37 cjs Exp $
+#	$NetBSD: Makefile,v 1.20 1997/06/23 13:25:58 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c
-MAN= rtld.1
 PICFLAG=-fpic -fno-function-cse
 CFLAGS+=$(PICFLAG) -DRTLD -DLIBC_SCCS
 ASFLAGS+=-k
@@ -14,7 +19,6 @@ LDADD+=	-lc_pic
 DPADD+=	${LIBC_PIC}
 BINDIR= /usr/libexec
 HDRS=	link.h
-MLINKS=	rtld.1 ld.so.1
 INCS=${HDRS}
 INCSDIR=/usr/include
 
@@ -25,5 +29,9 @@ $(PROG):
 
 .S.o:
 	${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
+.endif
+
+MAN= rtld.1
+MLINKS=	rtld.1 ld.so.1
 
 .include <bsd.prog.mk>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 77965a627fb5..aab616477658 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,9 +1,17 @@
-#	$NetBSD: Makefile,v 1.11 1997/04/16 16:49:42 christos Exp $
+#	$NetBSD: Makefile,v 1.12 1997/06/23 13:25:55 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ldconfig
 SRCS=	ldconfig.c shlib.c etc.c
 LDSTATIC=-static
 BINDIR=	/sbin
+.endif
+
 MAN=	ldconfig.8
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ldd/ldd_aout/Makefile b/usr.bin/ldd/ldd_aout/Makefile
index c9a2958953d7..7b39e25ca54b 100644
--- a/usr.bin/ldd/ldd_aout/Makefile
+++ b/usr.bin/ldd/ldd_aout/Makefile
@@ -1,7 +1,16 @@
-#	$NetBSD: Makefile,v 1.5 1995/10/09 00:09:39 pk Exp $
+#	$NetBSD: Makefile,v 1.6 1997/06/23 13:25:57 mrg Exp $
 
+.if	(${MACHINE_ARCH} == "i386") || \
+	(${MACHINE_ARCH} == "m68k") || \
+	(${MACHINE_ARCH} == "ns32k") || \
+	(${MACHINE_ARCH} == "sparc") || \
+	(${MACHINE_ARCH} == "vax") || \
+	(${MACHINE_ARCH} == "arm32")
 PROG=	ldd
 SRCS=	ldd.c
 BINDIR= /usr/bin
+.endif
+
+MAN=	ldd.1
 
 .include <bsd.prog.mk>