[src/trunk]: src Use ${MACHINE_CPU} to assign ARCHSUBDIR.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9cbfce3b0d9b
branches:  trunk
changeset: 521716:9cbfce3b0d9b
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Feb 04 00:24:14 2002 +0000

description:
Use ${MACHINE_CPU} to assign ARCHSUBDIR.

diffstat:

 libexec/ld.elf_so/Makefile |  4 ++--
 sys/arch/Makefile          |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r acdc21bbd0ef -r 9cbfce3b0d9b libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Mon Feb 04 00:18:32 2002 +0000
+++ b/libexec/ld.elf_so/Makefile        Mon Feb 04 00:24:14 2002 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.46 2002/02/03 23:34:42 thorpej Exp $
+#      $NetBSD: Makefile,v 1.47 2002/02/04 00:25:30 thorpej Exp $
 
 .include <bsd.own.mk>                  # for OBJECT_FMT definition
 
-ARCHSUBDIR= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/sh3e[bl]/sh3/}
+ARCHSUBDIR= ${MACHINE_CPU}
 M= ${.CURDIR}/arch/${ARCHSUBDIR}
 
 .if ((${MACHINE_ARCH} == "alpha") ||                                   \
diff -r acdc21bbd0ef -r 9cbfce3b0d9b sys/arch/Makefile
--- a/sys/arch/Makefile Mon Feb 04 00:18:32 2002 +0000
+++ b/sys/arch/Makefile Mon Feb 04 00:24:14 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2001/11/25 15:55:53 thorpej Exp $
+#      $NetBSD: Makefile,v 1.16 2002/02/04 00:24:14 thorpej Exp $
 
 # For now, we install the machine and arch includes, and symlink 'machine'
 # to the location of the machine includes (usually).
@@ -6,7 +6,8 @@
 # Eventually, we should install everything.
 
 SUBDIR=        ${MACHINE}
-ARCHSUBDIR= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/sh3e[bl]/sh3/:S/arm26/arm/:S/arm32/arm/:S/m68000/m68k/}
+ARCHSUBDIR= ${MACHINE_CPU}
+
 .if ${MACHINE} != ${ARCHSUBDIR}
 .if exists(${ARCHSUBDIR})
 SUBDIR+= ${ARCHSUBDIR}