summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKATO Takenori <kato@FreeBSD.org>1998-09-09 11:22:28 +0000
committerKATO Takenori <kato@FreeBSD.org>1998-09-09 11:22:28 +0000
commitd22114bfb88e7d486c95d93586983a0358618e65 (patch)
tree74aa8772880622088f6a0bf0298fec4bfccc57dd
parentc2c43bd135dbb9ebece2fada35d0b63e788bb9c2 (diff)
Notes
-rw-r--r--gnu/usr.bin/ld/Makefile6
-rw-r--r--lib/libc/Makefile10
2 files changed, 8 insertions, 8 deletions
diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile
index eda092e2f27d..6c9ff0774768 100644
--- a/gnu/usr.bin/ld/Makefile
+++ b/gnu/usr.bin/ld/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.25 1998/06/12 15:50:57 peter Exp $
+# $Id: Makefile,v 1.26 1998/09/07 05:46:09 jb Exp $
#
RTLD= ${.CURDIR}/../../../libexec/rtld-aout
@@ -9,10 +9,10 @@ BINDIR= /usr/libexec/aout
MAN1aout=ld.1aout
SRCS= ld.c symbol.c lib.c shlib.c warnings.c support.c rrs.c xbits.c md.c \
cplus-dem.c
-CFLAGS+= -I${.CURDIR} -I${RTLD} -I${RTLD}/${MACHINE} \
+CFLAGS+= -I${.CURDIR} -I${RTLD} -I${RTLD}/${MACHINE_ARCH} \
-I${GCCDIR} -DIN_GCC -DDEMANGLE_CPLUSPLUS -DFREEBSD_AOUT
NOSHARED?= yes
-.PATH: ${RTLD} ${RTLD}/${MACHINE} ${GCCDIR}
+.PATH: ${RTLD} ${RTLD}/${MACHINE_ARCH} ${GCCDIR}
.include <bsd.prog.mk>
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 49027aad6499..7f8dae320095 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $Id: Makefile,v 1.20 1998/02/12 01:44:53 nate Exp $
+# $Id: Makefile,v 1.21 1998/03/09 06:16:38 jb Exp $
#
# All library objects contain rcsid strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -10,7 +10,7 @@ LIB=c
SHLIB_MAJOR= 3
SHLIB_MINOR= 1
CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS -I${.CURDIR}/include
-AINC= -I${.CURDIR}/${MACHINE}
+AINC= -I${.CURDIR}/${MACHINE_ARCH}
CLEANFILES+=tags
INSTALL_PIC_ARCHIVE= yes
PRECIOUSLIB= yes
@@ -31,14 +31,14 @@ KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
KSRCS= bcmp.c ffs.c index.c mcount.c rindex.c strcat.c strcmp.c strcpy.c \
strlen.c strncpy.c
-libkern: libkern.gen libkern.${MACHINE}
+libkern: libkern.gen libkern.${MACHINE_ARCH}
libkern.gen: ${KQSRCS} ${KSRCS}
cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
-libkern.${MACHINE}:: ${KMSRCS}
+libkern.${MACHINE_ARCH}:: ${KMSRCS}
.if defined(KMSRCS) && !empty(KMSRCS)
- cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE}
+ cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH}
.endif
.include <bsd.lib.mk>