From b013ce2a48f5a1efde4a78f9cd040d360e922ebe Mon Sep 17 00:00:00 2001
From: simonb <simonb@NetBSD.org>
Date: Sat, 27 Nov 1999 23:57:42 +0000
Subject: [PATCH] Updated for new Makefile.booters and stand/ layout.

---
 sys/arch/pmax/stand/boot/Makefile     | 16 +++++++---------
 sys/arch/pmax/stand/smallnet/Makefile | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/sys/arch/pmax/stand/boot/Makefile b/sys/arch/pmax/stand/boot/Makefile
index ada0ccfeccc8..dd55febb006e 100644
--- a/sys/arch/pmax/stand/boot/Makefile
+++ b/sys/arch/pmax/stand/boot/Makefile
@@ -1,17 +1,15 @@
-#	$NetBSD: Makefile,v 1.5 1999/04/11 04:25:15 simonb Exp $
+#	$NetBSD: Makefile,v 1.6 1999/11/27 23:57:42 simonb Exp $
 #	@(#)Makefile	8.3 (Berkeley) 2/16/94
 
-S=	${.CURDIR}/../../../..
+SECONDARY_PROG=	boot.pmax
 
-PROG=		boot
-RELOC=		80710000
-BINMODE=	555
 SRCS=		start.S boot.c
-NEWVERSWHAT=	"Secondary Boot"
-VERSIONFILE=	${.CURDIR}/version
-.PATH:  	${.CURDIR}/../lib
+SRCS+=		bootinfo.c callvec.c conf.c devopen.c putchar.c rz.c
+SRCS+=		bootinit.S bootread.S getchar.S startprog.S
 
-# Copy boot to / as well.
+CPPFLAGS+=	-DBOOT_TYPE_NAME='"Secondary"'
+
+# Copy bootpmax to / as well.
 afterinstall:
 	cp -p ${DESTDIR}${BINDIR}/${PROG} ${DESTDIR}/
 
diff --git a/sys/arch/pmax/stand/smallnet/Makefile b/sys/arch/pmax/stand/smallnet/Makefile
index f371a4a1bf4d..e61b68f7202c 100644
--- a/sys/arch/pmax/stand/smallnet/Makefile
+++ b/sys/arch/pmax/stand/smallnet/Makefile
@@ -1,19 +1,18 @@
-#	$NetBSD: Makefile,v 1.1 1999/05/13 08:38:05 simonb Exp $
+#	$NetBSD: Makefile,v 1.2 1999/11/27 23:57:43 simonb Exp $
 #	@(#)Makefile	8.3 (Berkeley) 2/16/94
 
-S=	${.CURDIR}/../../../..
+KERNELSIZE!=		expr 400 \* 1024
 
-KERNELSIZE!=	expr 400 \* 1024
+SUBDIR=			setnetimage
 
-SUBDIR=		setnetimage
+SECONDARY_PROG=		smallnet
+SECONDARY_LOAD_ADDRESS=	0x80300000	# 3MB - should work on 4MB machines
+SRCS=			start.S smallnet.c
+SRCS+=			bootinfo.c callvec.c putchar.c
 
-PROG=		smallnet
-RELOC=		80300000		# 3MB - should work on 4MB machines
-SRCS=		start.S smallnet.c
-BOOTDEFADD=	-DBOOT_TYPE_NAME='"Compressed Kernel Network"' \
-		-DRELOC=0x${RELOC} -DKERNELSIZE=${KERNELSIZE}
-VERSIONFILE=	${.CURDIR}/version
-.PATH:  	${.CURDIR}/../lib
+CPPFLAGS+=		-DBOOT_TYPE_NAME='"Compressed Kernel Network"' \
+			-DRELOC=${SECONDARY_LOAD_ADDRESS} \
+			-DKERNELSIZE=${KERNELSIZE}
 
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>