Simplify a bit. Use installboot.

distrib/vax/floppy/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/03/29 06:36:04 matt Exp $
+#	$NetBSD: Makefile,v 1.4 2002/03/29 22:53:30 matt Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 .include <bsd.own.mk>
@@ -7,21 +7,28 @@
 INSTKERNOBJ!=	cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR}
 
 IMAGE=		boot.fs
+IMAGESIZE=	1200k
+XXBOOT=		${DESTDIR}/usr/mdec/xxboot_ustarfs 
 
-IMAGEDEPENDS=	${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/xxboot_ustarfs \
-		netbsd.gz
-CLEANFILES+=	netbsd.gz ${IMAGE}.tar
+IMAGEDEPENDS=	${XXBOOT} boot netbsd.gz
+CLEANFILES+=	netbsd.gz boot ${IMAGE}.tmp
 
-realall: ${IMAGE} ${DESTDIR}/usr/mdec/xxboot_ustarfs ${DESTDIR}/usr/mdec/boot
+realall: ${IMAGE} ${XXBOOT} ${DESTDIR}/usr/mdec/boot
 
 netbsd.gz: ${INSTKERNOBJ}/netbsd.INSTALL.gz 
 	cp -f ${.ALLSRC} ${.TARGET}
 
+boot: ${DESTDIR}/usr/mdec/boot
+	cp -f ${.ALLSRC} ${.TARGET}
+
 ${IMAGE}: ${IMAGEDEPENDS}
-	( dd if=${DESTDIR}/usr/mdec/xxboot_ustarfs bs=8k conv=sync && \
-	  tar -cf - -b 2384 \
-		-C ${DESTDIR}/usr/mdec boot \
-		-C ${.OBJDIR} netbsd.gz) > ${IMAGE}.tmp
-	mv ${IMAGE}.tmp ${IMAGE}
+	echo USTARFS 0 > ${IMAGE}.tmp
+	pax -w -x ustar boot netbsd.gz | dd of=${IMAGE}.tmp seek=16
+.if ${USETOOLS} == "yes"
+	${TOOLDIR}/bin/nbvax-installboot -v ${IMAGE}.tmp ${XXBOOT}
+.else
+	${DESTDIR}/usr/mdec/installboot -v ${IMAGE}.tmp ${XXBOOT}
+.endif
+	dd if=${IMAGE}.tmp of=${IMAGE} obs=${IMAGESIZE} conv=osync
 
 .include <bsd.prog.mk>