summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-09-09 11:27:33 +0000
committerkato <kato@FreeBSD.org>1998-09-09 11:27:33 +0000
commit20d8a739bdaffd0bd8f9ab2ef80443f82b9bc8a1 (patch)
tree3a8d27f5b278e1c64f522b7ad0f7a0380ae8c9d8
parent0c6fdf055e4c617c37fe33d0aab8764c541c4b39 (diff)
downloadFreeBSD-src-20d8a739bdaffd0bd8f9ab2ef80443f82b9bc8a1.zip
FreeBSD-src-20d8a739bdaffd0bd8f9ab2ef80443f82b9bc8a1.tar.gz
Change ${MACHINE} into ${MACHINE_ARCH} to support MACHINE=pc98.
-rw-r--r--lib/libcompat/Makefile22
-rw-r--r--lib/libkvm/Makefile2
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index 36c41a5..c9ba0ec 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -2,19 +2,19 @@
LIB=compat
CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
-AINC= -I${.CURDIR}/../libc/${MACHINE}
+AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH}
NOPIC=
-.PATH: ${.CURDIR}/4.1/${MACHINE} ${.CURDIR}/4.1 \
- ${.CURDIR}/4.3/${MACHINE} ${.CURDIR}/4.3 \
- ${.CURDIR}/4.4/${MACHINE} ${.CURDIR}/4.4 \
+.PATH: ${.CURDIR}/4.1/${MACHINE_ARCH} ${.CURDIR}/4.1 \
+ ${.CURDIR}/4.3/${MACHINE_ARCH} ${.CURDIR}/4.3 \
+ ${.CURDIR}/4.4/${MACHINE_ARCH} ${.CURDIR}/4.4 \
${.CURDIR}/regexp
# compat 4.1 sources
# XXX MISSING: tell.c vlimit.c vtimes.c
SRCS+= ascftime.c cftime.c ftime.c getpw.c gtty.c stty.c
-.if (${MACHINE} == "vax")
+.if (${MACHINE_ARCH} == "vax")
SRCS+= reset.s
.endif
@@ -28,17 +28,17 @@ MLINKS+=cftime.3 ascftime.3
# XXX MISSING: ecvt.c gcvt.c sibuf.c sobuf.c strout.c
SRCS+= cfree.c lsearch.c regex.c rexec.c
-.if (${MACHINE} == "hp300" || ${MACHINE} == "luna68k")
+.if (${MACHINE_ARCH} == "hp300" || ${MACHINE_ARCH} == "luna68k")
SRCS+= insque.s remque.s
-.elif (${MACHINE} == "i386")
+.elif (${MACHINE_ARCH} == "i386")
SRCS+= insque.c remque.c
-.elif (${MACHINE} == "mips")
+.elif (${MACHINE_ARCH} == "mips")
SRCS+= insque.c remque.c
-.elif (${MACHINE} == "sparc")
+.elif (${MACHINE_ARCH} == "sparc")
SRCS+= insque.c remque.c
-.elif (${MACHINE} == "tahoe")
+.elif (${MACHINE_ARCH} == "tahoe")
SRCS+= nargs.s insque.s remque.s
-.elif (${MACHINE} == "vax")
+.elif (${MACHINE_ARCH} == "vax")
SRCS+= nargs.s insque.s remque.s
.endif
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 2980402..c31992d 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -2,7 +2,7 @@
LIB= kvm
CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys
-SRCS= kvm.c kvm_${MACHINE}.c kvm_file.c kvm_getloadavg.c kvm_proc.c
+SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c kvm_proc.c
MAN3= kvm.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 kvm_getprocs.3 \
kvm_nlist.3 kvm_open.3 kvm_read.3
OpenPOWER on IntegriCloud