Use MACHINE_ARCH instead of ARCH

diff --git a/commands/Makefile b/commands/Makefile
index 0a133ab6f9aeb929b456d0a65786e4ed03d8fe1e..9ac6b40032fdda09f0791fd02dda3792d4e36f9f 100644 (file)
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -35,7 +35,7 @@ SUBDIR=       add_route arp ash at awk \
        xargs yacc yes zdump zmodem pkgin_cd \
        mktemp worldstone updateboot update_bootcfg
 
-.if ${ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 SUBDIR+=       atnormalize dosread fdisk loadfont \
        autopart part partition playwave  \
        recwave repartition screendump

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index dbe250135fe99744af68f33f8cb11bc9d66540c7..24f68b5a227e60e17ce641120a54fb85c92e1c0b 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -25,7 +25,7 @@ touch-genfiles:
 # but bsd.own.mk has to be upgraded for that.
 .mfs.o:
        ${_MKTARGET_CREATE}
-       ${OBJCOPY} -Ibinary -B${ARCH} -Oelf32-${ARCH}-minix $< $@
+       ${OBJCOPY} -Ibinary -B${MACHINE_ARCH} -Oelf32-${MACHINE_ARCH}-minix $< $@
 
 ${RAMDISK_PATH}/image: .PHONY
        ${MAKE} -C ${RAMDISK_PATH} image

diff --git a/kernel/Makefile b/kernel/Makefile
index d3b89326f1de7afc4bb208310e359df78bf9965f..fb3c22ee07ffb6b264adea8c05c3c1d3c6412352 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -3,7 +3,7 @@
 
 PROG=  kernel
 
-.include "arch/${ARCH}/Makefile.inc"
+.include "arch/${MACHINE_ARCH}/Makefile.inc"
 
 SRCS+= clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \
        table.c utility.c 
@@ -14,7 +14,7 @@ LDADD+=       -ltimers -lsys -lexec
 CFLAGS += -D__kernel__
 
 CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE
-LDFLAGS+= -T ${.CURDIR}/arch/${ARCH}/kernel.lds
+LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/kernel.lds
 LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR}
 LDADD+= -lminlib
 DPADD+= ${LIBMINLIB}
@@ -25,7 +25,7 @@ LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Gener
 DPADD+=        ${LIBC}
 .endif
 
-CPPFLAGS+=     -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${NETBSDSRCDIR}
+CPPFLAGS+=     -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}/include -I${NETBSDSRCDIR}
 
 BINDIR=        /usr/sbin
 MAN=

diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc
index 53bbfb13fa708ea3250f54275e410cbdcc4b2118..172803a195ba95af4a4f645ff956b81a1541d58e 100644 (file)
--- a/kernel/arch/i386/Makefile.inc
+++ b/kernel/arch/i386/Makefile.inc
@@ -2,7 +2,7 @@
 # Makefile for arch-dependent kernel code
 .include <bsd.own.mk>
 
-HERE=${.CURDIR}/arch/${ARCH}
+HERE=${.CURDIR}/arch/${MACHINE_ARCH}
 .PATH: ${HERE}
 SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
        do_iopenable.c do_readbios.c do_sdevio.c exception.c i8259.c io_inb.S \

diff --git a/lib/libc/arch/i386/sys-minix/Makefile.inc b/lib/libc/arch/i386/sys-minix/Makefile.inc
index 6cf381dae7efa71504c5ecf8e905fc0b547417b6..82b6ee2ed5cf535afd422594209119eff9650229 100644 (file)
--- a/lib/libc/arch/i386/sys-minix/Makefile.inc
+++ b/lib/libc/arch/i386/sys-minix/Makefile.inc
@@ -1,5 +1,5 @@
 # rts sources
-.PATH: ${.CURDIR}/arch/${ARCH}/sys-minix
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/sys-minix
 
 SRCS+=   \
        __sigreturn.S \

diff --git a/lib/libcompat_minix/Makefile b/lib/libcompat_minix/Makefile
index 1f545ead2c987659bca8e96431777186b4310cdf..2ee3492e440475ed3e442805f34c79c8f44ad1a7 100644 (file)
--- a/lib/libcompat_minix/Makefile
+++ b/lib/libcompat_minix/Makefile
@@ -2,7 +2,6 @@
 
 LIB=   compat_minix
 CPPFLAGS+= -D_MINIX_COMPAT
-MACHINE_ARCH= ${ARCH}
 USE_SHLIBDIR= yes
 
 .PATH:         ${.CURDIR}

diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index a2f27fd5f10aa04c78d559983bf7bd58c6495d0a..993af5bc93dd78280bbcce0ceb8661709e483b25 100644 (file)
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -13,8 +13,8 @@ MAN=
 
 BINDIR?= /usr/sbin
 
-CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}
+CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 CPPFLAGS+=     -I${NETBSDSRCDIR}
 
-.include "arch/${ARCH}/Makefile.inc"
+.include "arch/${MACHINE_ARCH}/Makefile.inc"
 .include <minix.bootprog.mk>

diff --git a/servers/vm/arch/i386/Makefile.inc b/servers/vm/arch/i386/Makefile.inc
index 34b9b5a108a2e5d3331061505a138a179f4b65c9..530df1a1fe628f0414f6355440be1e89af1cf343 100644 (file)
--- a/servers/vm/arch/i386/Makefile.inc
+++ b/servers/vm/arch/i386/Makefile.inc
@@ -1,5 +1,5 @@
 .include <bsd.own.mk>
 
 #Arch-specific sources
-.PATH: ${.CURDIR}/arch/${ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
 SRCS+= vm.c pagetable.c #util.S