Change MACHINE references to MACHINE_ARCH.

4 files changed, 11 insertions, 11 deletions

diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 87a41f6..1b10cc5 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.10 1997/10/15 16:15:34 bde Exp $
+#	$Id: Makefile.inc,v 1.11 1997/10/21 08:41:07 bde Exp $
 
 # locale sources
-.PATH: ${.CURDIR}/../libc/${MACHINE}/locale ${.CURDIR}/../libc/locale
+.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
 
 SRCS+=	ansi.c collate.c collcmp.c ctype.c euc.c frune.c isctype.c lconv.c \
 	localeconv.c mbrune.c mskanji.c nomacros.c none.c rune.c runetype.c \
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index c7381db..d01fd2e 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-#	$Id: Makefile.inc,v 1.24 1997/10/15 16:15:41 bde Exp $
+#	$Id: Makefile.inc,v 1.25 1997/10/21 08:41:08 bde Exp $
 
 # machine-independent net sources
-.PATH: ${.CURDIR}/../libc/${MACHINE}/net ${.CURDIR}/../libc/net
+.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net
 
 SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
@@ -18,7 +18,7 @@ SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c \
 # not supported: iso_addr.c 
 
 # machine-dependent net sources
-.include "${.CURDIR}/../libc/${MACHINE}/net/Makefile.inc"
+.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc"
 
 .if ${LIB} == "c"
 MAN3+=	addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 \
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 3e84f42..670d84a 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -1,10 +1,10 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.5 1997/05/03 03:50:02 jb Exp $
+#	$Id: Makefile.inc,v 1.6 1997/12/19 21:56:38 bde Exp $
 
 # Quad support, if needed
-.PATH: ${.CURDIR}/../libc/${MACHINE}/quad ${.CURDIR}/../libc/quad
+.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad
 
-.if ${MACHINE} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 
 SRCS+=	cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c
 
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 5583ce3..587da37 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,7 +1,7 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile.inc,v 1.12 1997/10/16 13:46:50 bde Exp $
+#	$Id: Makefile.inc,v 1.13 1997/10/21 08:41:15 bde Exp $
 
-.PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
 
 CFLAGS += -I${.CURDIR}/../libc/locale
 
@@ -13,7 +13,7 @@ MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
 	strspn.c strstr.c strtok.c strxfrm.c swab.c
 
 # machine-dependent string sources
-.include "${.CURDIR}/../libc/${MACHINE}/string/Makefile.inc"
+.include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc"
 
 .if ${LIB} == "c"
 MAN3+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \