diff --git a/distrib/vax/Makefile b/distrib/vax/Makefile index edfb7e872499..75d7b0f8986f 100644 --- a/distrib/vax/Makefile +++ b/distrib/vax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/09/12 16:06:55 matt Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/04 20:33:03 matt Exp $ .include # Use /etc/mk.conf. @@ -6,7 +6,7 @@ ITARGET= ${RELEASEDIR}/installation IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} -SUBDIR= ramdisk ramdisk-kernel #inst tk50 rx50 rx33 +SUBDIR= ramdisk ramdisk-kernel floppy #inst tk50 rx50 rx33 .include @@ -15,10 +15,11 @@ release: @echo setenv RELEASEDIR first @false .else -INSTKERNOBJ != cd ${.CURDIR}/ramdisk-kernel; ${MAKE} print-objdir -BOOTOBJ != cd ${.CURDIR}/../../sys/arch/vax/boot/boot; ${MAKE} print-objdir +INSTKERNOBJ != cd ${.CURDIR}/ramdisk-kernel && ${PRINTOBJDIR} +FLOPPYOBJ != cd ${.CURDIR}/floppy && ${PRINTOBJDIR} release: - ${IINST} ${BOOTOBJ}/boot.mop ${ITARGET}/netboot/ + ${IINST} ${DESTDIR}/usr/mdec/boot.mop ${ITARGET}/netboot/ ${IINST} ${INSTKERNOBJ}/netbsd.INSTALL.gz ${ITARGET}/netboot/netbsd.ram.gz + ${IINST} ${FLOPPYOBJ}/boot.fs ${ITARGET}/bootfs/ .endif diff --git a/distrib/vax/ramdisk-kernel/Makefile b/distrib/vax/ramdisk-kernel/Makefile index effbb03a8710..0f8936c42f22 100644 --- a/distrib/vax/ramdisk-kernel/Makefile +++ b/distrib/vax/ramdisk-kernel/Makefile @@ -1,21 +1,20 @@ -# $NetBSD: Makefile,v 1.1 2000/05/23 18:34:58 matt Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/04 20:33:03 matt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" +.include .include MDEC= ${DESTDIR}/usr/mdec STRIP?= strip -RAMDISK!= cd $(.CURDIR)/../ramdisk/; \ - printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \ - ${MAKE} -s -f- +RAMDISK!= cd ${.CURDIR}/../ramdisk/ && ${PRINTOBJDIR} .for kernel in INSTALL netbsd.${kernel}.gz: .NOTMAIN ${KERNOBJDIR}/${kernel}/netbsd ${RAMDISK} cp ${KERNOBJDIR}/${kernel}/netbsd netbsd.tmp - ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK} + ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}/ramdisk.fs ${STRIP} netbsd.tmp gzip -9 netbsd.tmp mv netbsd.tmp.gz ${.TARGET}