hardcode mvme68k, so that obj dirs can be built from elsewhere

10 files changed, 35 insertions, 35 deletions

diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index d098d732b4b..85f27b11a30 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.7 1997/04/22 16:13:39 gvf Exp $
+#	$OpenBSD: Makefile,v 1.8 1997/10/20 00:33:42 deraadt Exp $
 
 RELOC=0x3F0000 
 
@@ -11,10 +11,10 @@ CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
 LDFLAGS=-N -T ${RELOC}
 CLEANFILES+=bootsd
 
-.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libz/Makefile.inc"
 
 SRCS=   boot.c conf.c version.c
 
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index c8cb9255745..82d4e27aeac 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.8 1997/04/22 16:13:40 gvf Exp $
+#	$OpenBSD: Makefile,v 1.9 1997/10/20 00:33:43 deraadt Exp $
 
 RELOC=0x3F0000 
 SIZE?=	size
@@ -11,11 +11,11 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
 CLEANFILES+=stboot bootst bootst.bug
 
-.include "${S}/arch/${MACHINE}/stand/wrtvid/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libz/Makefile.inc"
 
 SRCS=   boot.c conf.c dev_tape.c rawfs.c version.c
 
diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile
index fe881a90d3a..b1e3174b560 100644
--- a/sys/arch/mvme68k/stand/bootxx/Makefile
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.2 1997/04/22 16:13:41 gvf Exp $
+#	$OpenBSD: Makefile,v 1.3 1997/10/20 00:33:44 deraadt Exp $
 
 RELOC=0x3F0000 
 
@@ -10,10 +10,10 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
 CLEANFILES+=bootxx
 
-.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libz/Makefile.inc"
 
 SRCS=   bootxx.c conf.c version.c
 
diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile.inc b/sys/arch/mvme68k/stand/bugcrt/Makefile.inc
index 76f65d824a2..a742cf4924f 100644
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile.inc
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:48:27 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1997/10/20 00:33:45 deraadt Exp $
 
-BUG_CRT_DIR=${S}/arch/${MACHINE}/stand/bugcrt
+BUG_CRT_DIR=${S}/arch/mvme68k/stand/bugcrt
 
 BUGCRT_DIR!= cd ${BUG_CRT_DIR}; \
      printf "xxx:\n\techo \$${.OBJDIR}\n" | ${MAKE} -r -s -f - xxx
diff --git a/sys/arch/mvme68k/stand/libbug/Makefile.inc b/sys/arch/mvme68k/stand/libbug/Makefile.inc
index 1d08d0f59fd..879ba4bd431 100644
--- a/sys/arch/mvme68k/stand/libbug/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libbug/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:48:34 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1997/10/20 00:33:46 deraadt Exp $
 
-LIB_BUG_DIR=${S}/arch/${MACHINE}/stand/libbug
+LIB_BUG_DIR=${S}/arch/mvme68k/stand/libbug
 
 LIBBUG_DIR!= cd ${LIB_BUG_DIR}; \
      printf "xxx:\n\techo \$${.OBJDIR}\n" | ${MAKE} -r -s -f - xxx
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile.inc b/sys/arch/mvme68k/stand/libsa/Makefile.inc
index f59d82643ea..6584c3acb89 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libsa/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1997/04/22 16:07:57 gvf Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 1997/10/20 00:33:46 deraadt Exp $
 
-LIB_SA_DIR=${S}/arch/${MACHINE}/stand/libsa
+LIB_SA_DIR=${S}/arch/mvme68k/stand/libsa
 
 LIBSA_DIR!= cd ${LIB_SA_DIR}; \
      printf "xxx:\n\techo \$${.OBJDIR}\n" | ${MAKE} -r -s -f - xxx
diff --git a/sys/arch/mvme68k/stand/libz/Makefile.inc b/sys/arch/mvme68k/stand/libz/Makefile.inc
index 1825a7eddd6..d58ceece6bd 100644
--- a/sys/arch/mvme68k/stand/libz/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libz/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.1 1997/04/22 16:13:42 gvf Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 1997/10/20 00:33:47 deraadt Exp $
 
-LIB_Z_DIR=${S}/arch/${MACHINE}/stand/libz
+LIB_Z_DIR=${S}/arch/mvme68k/stand/libz
 
 LIBZ_DIR!= cd ${LIB_Z_DIR}; \
      printf "xxx:\n\techo \$${.OBJDIR}\n" | ${MAKE} -r -s -f - xxx
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index dcde93b7057..6a7406ed935 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1997/04/27 20:56:30 millert Exp $
+#	$OpenBSD: Makefile,v 1.8 1997/10/20 00:33:48 deraadt Exp $
 
 RELOC=0x3F0000
 SIZE?=	size
@@ -10,10 +10,10 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 CFLAGS=	-O2 ${DEFS} ${INCPATH} ${COPTS}
 CLEANFILES+=netboot netboot.bin
 
-.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libz/Makefile.inc"
 
 SRCS=   boot.c conf.c version.c devopen.c dev_net.c
 SRCS+=	if_ie.c if_le.c
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index 19b444f8352..9a1c7532bf2 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.6 1997/04/27 20:56:30 millert Exp $
+#	$OpenBSD: Makefile,v 1.7 1997/10/20 00:33:49 deraadt Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
 COPTS?= ${DEFS} ${INCL}
 
-.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc"
-.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
+.include "${S}/arch/mvme68k/stand/libz/Makefile.inc"
 
 SRCS=   sboot.c clock.c etherfun.c if_le.c
 
diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile.inc b/sys/arch/mvme68k/stand/wrtvid/Makefile.inc
index 7e546a06886..25be01dc734 100644
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile.inc
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:49:48 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1997/10/20 00:33:50 deraadt Exp $
 
-WRTVID_BASE_DIR=${S}/arch/${MACHINE}/stand/wrtvid
+WRTVID_BASE_DIR=${S}/arch/mvme68k/stand/wrtvid
 
 WRTVID_DIR!= cd ${WRTVID_BASE_DIR}; \
      printf "xxx:\n\techo \$${.OBJDIR}\n" | ${MAKE} -r -s -f - xxx