${MACHINE} -> ${MACHINE_ARCH}

All Makefiles now use MACHINE_ARCH for the target architecture.
Unification is required for cross-building.

Tags added to:
	sys/boot/Makefile
	sys/boot/arc/loader/Makefile
	sys/kern/Makefile
	usr.bin/cpp/Makefile
	usr.bin/gcore/Makefile
	usr.bin/truss/Makefile

usr.bin/gcore/Makefile:
	fixed typo: MACHINDE -> MACHINE_ARCH

5 files changed, 13 insertions, 9 deletions

diff --git a/sys/Makefile b/sys/Makefile
index 0077456..57ff690 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 # This is the old aout only boot loader.
-.if	exists(${.CURDIR}/${MACHINE}/boot) && ${OBJFORMAT} == "aout"
-SUBDIR=	${MACHINE}/boot
+.if	exists(${.CURDIR}/${MACHINE_ARCH}/boot) && ${OBJFORMAT} == "aout"
+SUBDIR=	${MACHINE_ARCH}/boot
 .elif	exists(${.CURDIR}/boot) && ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf"
 SUBDIR=	boot
 .endif
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 8d7e2ad..0cdaeb2 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -1,11 +1,13 @@
+# $FreeBSD$
+
 # Build the add-in FORTH interpreter
 SUBDIR+=		ficl
 
 # Pick the machine-dependant subdir based on the target architecture.
-SUBDIR+=		${MACHINE}
+SUBDIR+=		${MACHINE_ARCH}
 
 # Build ARC / AlphaBIOS executable on the Alpha
-.if ${MACHINE} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 SUBDIR+=		arc
 .endif
 
diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile
index 023821c..a9c0e2d 100644
--- a/sys/boot/arc/lib/Makefile
+++ b/sys/boot/arc/lib/Makefile
@@ -5,7 +5,7 @@ NOPIC=		true
 NOPROFILE=	true
 INTERNALLIB=	true
 
-.PATH:		${.CURDIR}/arch/${MACHINE}
+.PATH:		${.CURDIR}/arch/${MACHINE_ARCH}
 # XXX hack to pick up stand.h
 LIBSTANDDIR=	${.CURDIR}/../../../../lib/libstand
 CFLAGS=		-I${LIBSTANDDIR}
@@ -22,7 +22,7 @@ CFLAGS+=	-I${.CURDIR}/../../common -mno-fp-regs \
 SRCS=	delay.c time.c abort.c setjmperr.c copy.c devicename.c module.c \
 	arcconsole.c arcdisk.c elf_freebsd.c bootinfo.c
 
-.if ${MACHINE} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
 SRCS+=	rpb.c
 .endif
 
diff --git a/sys/boot/arc/loader/Makefile b/sys/boot/arc/loader/Makefile
index 1fdb2c3..acbb066 100644
--- a/sys/boot/arc/loader/Makefile
+++ b/sys/boot/arc/loader/Makefile
@@ -1,4 +1,5 @@
 #	$NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
+# $FreeBSD$
 
 BASE= 		loader
 PROG= 		${BASE}.exe
@@ -63,7 +64,7 @@ beforeinstall:
 .endif
 
 # Other fragments still to be brought in from ../Makfile.booters?
-start.o:	${.CURDIR}/../lib/arch/${MACHINE}/start.S
+start.o:	${.CURDIR}/../lib/arch/${MACHINE_ARCH}/start.S
 	${CC} -c ${CFLAGS} $<
 
 setdef0.o: setdefs.h
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index 00ee277..ba453b2 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/21/94
+# $FreeBSD$
 
 # Makefile for kernel tags files, init_sysent, etc.
 
@@ -24,7 +25,7 @@ init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall-hide.h \
 # are placed in each source directory.  We need to have links to tags files
 # from the generic directories that are relative to the machine type, even
 # via remote mounts; therefore we use symlinks to $SYSTAGS, which points at
-# ${SYSDIR}/${MACHINE}/tags.
+# ${SYSDIR}/${MACHINE_ARCH}/tags.
 
 SYSTAGS=/var/db/sys_tags
 SYSDIR=/sys
@@ -47,7 +48,7 @@ tags::
 
 links::
 	rm -f ${SYSTAGS}
-	ln -s ${SYSDIR}/${MACHINE}/tags ${SYSTAGS}
+	ln -s ${SYSDIR}/${MACHINE_ARCH}/tags ${SYSTAGS}
 	-for i in ${DGEN}; do \
 	    (cd ../$$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done
 	-for i in ${ARCH}; do \