4 files changed, 30 insertions, 14 deletions
diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index 52fdb9b2b8e..a67b4e1102a 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,13 +1,13 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.4 1996/05/07 03:21:07 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.5 1996/05/10 20:03:46 deraadt Exp $
 
 RELOC=0x3F0000 
 
 S=	${.CURDIR}/../../../..
 DEFS= -DSTANDALONE -DCOMPAT_NOLABEL # -DROMPRF
-INCPATH=-I${.CURDIR} -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
+INCPATH=-I${.CURDIR} -I${S} -I${.OBJDIR} -I${S}/lib/libsa
 CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
-CLEANFILES+=sdboot bootsd bootsd.bug bootsd.bin
+CLEANFILES+=sdboot bootsd bootsd.bug bootsd.bin machine
 
 #.PATH: ${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 #.PATH: ${S}/lib/libsa
@@ -26,7 +26,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 BOOTS=	bootsd sdboot
 ALL=	${BOOTS} 
 
-all: ${ALL}
+all: machine ${ALL}
 
 devopen.o machdep.o: Makefile
 
@@ -47,4 +47,7 @@ bootsd sdboot: bootsd.bug ${WRTVID}
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
 
+machine:
+	rm -f machine; ln -s ${.CURDIR}/../../include machine
+
 .include <bsd.prog.mk>
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index d1204e6ae0a..ee88405e7e5 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,13 +1,13 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.4 1996/05/07 03:27:36 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.5 1996/05/10 20:03:47 deraadt Exp $
 
 RELOC=0x3F0000 
 
 S=	${.CURDIR}/../../../..
 DEFS= -DSTANDALONE -DCOMPAT_NOLABEL # -DROMPRF
-INCPATH=-I${.CURDIR} -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
+INCPATH=-I${.CURDIR} -I${S} -I${.OBJDIR} -I${S}/lib/libsa
 CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
-CLEANFILES+=stboot bootst bootst.bug
+CLEANFILES+=stboot bootst bootst.bug machine
 
 #.PATH: ${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 #.PATH: ${S}/lib/libsa
@@ -26,7 +26,7 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 BOOTS=	bootst stboot
 ALL=	${BOOTS} 
 
-all: ${ALL}
+all: machine ${ALL}
 
 bootst.bug:	${OBJS} ${BUGCRT} ${LIBS}
 	${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@
@@ -38,4 +38,7 @@ bootst stboot: bootst.bug ${WRTVID}
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
 
+machine:
+	rm -f machine; ln -s ${.CURDIR}/../../include machine
+
 .include <bsd.prog.mk>
diff --git a/sys/arch/mvme68k/stand/libbug/Makefile b/sys/arch/mvme68k/stand/libbug/Makefile
index 1231d08713c..53a0a185ff5 100644
--- a/sys/arch/mvme68k/stand/libbug/Makefile
+++ b/sys/arch/mvme68k/stand/libbug/Makefile
@@ -1,16 +1,23 @@
-#	$OpenBSD: Makefile,v 1.3 1996/05/07 11:25:05 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/05/10 20:03:48 deraadt Exp $
 
 LIB=bug
 
 NOPIC=
 NOPROFILE=
 
-CFLAGS+=-I${.CURDIR}/../../include
+CLEANFILES+=machine
+
+CFLAGS+=-I${.OBJDIR}
 
 SRCS=	delay.c diskrd.c diskwr.c getbrdid.c instat.c outln.c outstr.c \
 	return.c rtc_rd.c
 .PATH:    ${.CURDIR}/../../../../lib/libc_sa
 
+all:	machine libbug.a
+
 install:
 
+machine:
+	rm -f machine; ln -s ${.CURDIR}/../../include machine
+
 .include <bsd.lib.mk>
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index 0b56069a653..685912d01e9 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.8 1996/04/28 10:48:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 1996/05/10 20:03:49 deraadt Exp $
 
 LIB=sa
 
-CLEANFILES+=SRT0.o SRT1.o
+CLEANFILES+=SRT0.o SRT1.o machine
 
 NOPIC=nopic
 NOPROFILE=noprofile
@@ -34,14 +34,17 @@ SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_sun3} ${SRC_here}
 # 	-DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
 
 #DEFS= -DCOMPAT_UFS
-INCL= -I. -I${S}/lib/libsa -I${S}
+INCL= -I${.CURDIR} -I${S} -I${S}/lib/libsa -I${.OBJDIR}
 COPTS= #-fno-defer-pop
 CFLAGS= -O2 ${COPTS} ${DEFS} ${DBG} ${INCL}
 
 .PATH:  ${DIR_SA} ${DIR_KERN} ../../sun3
 
-all: libsa.a SRT0.o SRT1.o
+all: machine libsa.a SRT0.o SRT1.o
 
 install:
 
+machine:
+	rm -f machine; ln -s ${.CURDIR}/../../include machine
+
 .include <bsd.lib.mk>