Stuff

3 files changed, 22 insertions, 13 deletions

diff --git a/sys/arch/mvme88k/Makefile b/sys/arch/mvme88k/Makefile
index e17d8971023..710a5ca6f74 100644
--- a/sys/arch/mvme88k/Makefile
+++ b/sys/arch/mvme88k/Makefile
@@ -1,5 +1,9 @@
 #	from: @(#)Makefile	7.3 (Berkeley) 6/9/91
-#	$Id: Makefile,v 1.1 1995/10/18 10:54:18 deraadt Exp $
+#	$Id: Makefile,v 1.2 1998/09/15 04:01:21 smurph Exp $
+
+SUBDIR= stand
+DIRS= conf dev ddb mvme88k include
+
 S=${BSDSRCDIR}/sys
 COMM=	$S/vm/*.[ch] $S/ufs/*.[ch] $S/sys/*.h $S/compat/sunos/*.[ch] \
 	$S/nfs/*.[ch] $S/netns/*.[ch] $S/netiso/*.[ch] \
@@ -9,16 +13,16 @@ COMM=	$S/vm/*.[ch] $S/ufs/*.[ch] $S/sys/*.h $S/compat/sunos/*.[ch] \
 
 # Makefile for m88k tags file
 
-all:
-	@echo "make tags or links only"
+#all:
+#	@echo "make tags or links only"
 
-TM88K=	$S/arch/m88k/tags
-SM88K=	$S/arch/m88k/m88k/*.[ch] $S/arch/m88k/include/*.h \
-	$S/arch/m88k/dev/*.[ch]
-AM88K=	$S/arch/m88k/m88k/*.s
+TM88K=	$S/arch/mvme88k/tags
+SM88K=	$S/arch/mvme88k/mvme88k/*.[ch] $S/arch/mvme88k/include/*.h \
+	$S/arch/mvme88k/dev/*.[ch]
+AM88K=	$S/arch/mvme88k/mvme88k/*.s
 
 # Directories in which to place m88k tags links
-DM88K=	m88k dev include
+DM88K=	mvme88k dev include
 
 TAGS:
 	-etags -dt ${COMM} ${SM88K} ${AM88K}
@@ -38,5 +42,8 @@ links:
 	    rm -f $$i/tags; rm -f $$i/TAGS ; \
 	    ln -s ../tags $$i/tags; ln -s ../TAGS $$i/TAGS; done
 
+obj:	_SUBDIRUSE
+
 .include <bsd.prog.mk>
+.include <bsd.subdir.mk>
 
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index a3454cc9819..213dcc9357a 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -2,7 +2,7 @@
 # This configuration file contains all possible options
 #
 
-machine m88k
+machine mvme88k
 
 maxusers 8
 
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 154ea761bff..e104e579ab9 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,5 +1,5 @@
 #	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
-#	$Id: Makefile.mvme88k,v 1.3 1997/09/15 02:40:32 deraadt Exp $
+#	$Id: Makefile.mvme88k,v 1.4 1998/09/15 04:01:22 smurph Exp $
 #
 # Makefile for NetBSD
 #
@@ -22,11 +22,13 @@
 
 # DEBUG is set to -g by config if debugging is requested (config -g).
 # PROF is set to -pg by config if profiling is requested (config -p).
-AS=     as ${DEBUG}
+DESTDIR=/usr/cross/mvme88k
+DESTBIN=${DESTDIR}/usr/m88k-unknown-openbsd2.2/bin
+AS=     ${DESTBIN}/as ${DEBUG}
 AWK=	awk
-CC=     cc ${DEBUG}
+CC=     ${DESTBIN}/gcc ${DEBUG}
 CPP=    cpp
-LD=     ld
+LD=     ${DESTBIN}/ld
 TOUCH=	touch -f -c
 
 .ifndef HOSTCC