summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Murphree <smurph@cvs.openbsd.org>1998-08-18 04:17:09 +0000
committerSteve Murphree <smurph@cvs.openbsd.org>1998-08-18 04:17:09 +0000
commitb476b9f437996656e2523ecf3762ca651c146e60 (patch)
tree12c33b409d730a66249781382f63d507dddcd4e6
parentda8d7fc7fdfd07256cd8de1185274561bb9f5dc9 (diff)
New bootblocks code to work with bootxx.
-rw-r--r--sys/arch/mvme68k/stand/bootsd/Makefile16
-rw-r--r--sys/arch/mvme68k/stand/bootsd/version.c4
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index 85f27b11a30..6a6dbc2c4f4 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.8 1997/10/20 00:33:42 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 1998/08/18 04:17:07 smurph Exp $
RELOC=0x3F0000
@@ -11,14 +11,14 @@ CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS}
LDFLAGS=-N -T ${RELOC}
CLEANFILES+=bootsd
-.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"
+.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"
SRCS= boot.c conf.c version.c
-LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
+LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} libgcc.a
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
@@ -29,8 +29,8 @@ all: ${ALL}
bootsd: ${OBJS} ${BUGCRT} ${LIBS}
${LD} ${LDFLAGS} -o $@ \
- ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBS}
-
+ ${BUGCRT} ${OBJS} ${LIBS}
+#${SRTOBJ}
install:
install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme68k/stand/bootsd/version.c b/sys/arch/mvme68k/stand/bootsd/version.c
index 2289dd21772..220319b1bb6 100644
--- a/sys/arch/mvme68k/stand/bootsd/version.c
+++ b/sys/arch/mvme68k/stand/bootsd/version.c
@@ -1,8 +1,8 @@
-/* $OpenBSD: version.c,v 1.7 1997/04/22 16:13:39 gvf Exp $ */
+/* $OpenBSD: version.c,v 1.8 1998/08/18 04:17:08 smurph Exp $ */
/*
* make a random change to this file when you want the bootblock
* revision to increase. like change this q to an x, or something.
*/
-char *version = "$Revision: 1.7 $";
+char *version = "$Revision: 1.8 $";