Convert to using ${MDSETIMAGE}.

Provide a default value for $MDSETIMAGE and pull in bsd.own.mk to have it overriden as needed for cross/-current builds.
2001-10-21 23:23:19 +00:00 · 2001-10-21 23:23:19 +00:00 · 4d6ad24166
commit 4d6ad24166
parent 57d273d68a
23 changed files with 84 additions and 52 deletions
--- a/distrib/alpha/instkernel/instkernel/Makefile
+++ b/distrib/alpha/instkernel/instkernel/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2000/09/10 21:59:00 jhawk Exp $
+#	$NetBSD: Makefile,v 1.14 2001/10/21 23:23:19 jmc Exp $

 .include "../../../../Makefile.inc"

@ -6,12 +6,13 @@ RAMDISK!=cd ${.CURDIR}/../ramdisk; \
 	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
 	${MAKE} -s -f-

+MDSETIMAGE?=	mdsetimage
 KERNEL?=${KERNOBJDIR}/INSTALL/netbsd
 STRIP?=		strip		# make STRIP=echo can be useful

 all:
 	cp ${KERNEL} netbsd
-	mdsetimage -v netbsd ${RAMDISK}
+	${MDSETIMAGE} -v netbsd ${RAMDISK}
 	nm netbsd > netbsd.symbols
 	${STRIP} netbsd
 	gzip -9f netbsd
--- a/distrib/arm32/kernels/Makefile
+++ b/distrib/arm32/kernels/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2000/11/12 00:56:13 matt Exp $
+#	$NetBSD: Makefile,v 1.2 2001/10/21 23:23:19 jmc Exp $

 TOP=		${.CURDIR}/..

@ -15,13 +15,14 @@ RAMDISK!=	cd $(.CURDIR)/../ramdisk/; \
 		    ${MAKE} -s -f-

 CLEANFILES+=	netbsd.tmp ${KERNELS:C/^.*$/netbsd.&.gz/g}
+MDSETIMAGE?=	mdsetimage

 all:	${KERNELS:C/^.*$/netbsd.&.gz/g}

 .for kern in ${KERNELS}
 netbsd.${kern}.gz: ${KERNOBJDIR}/${kern}/netbsd ${RAMDISK}
 	cp ${KERNOBJDIR}/${kern}/netbsd netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
 	mv netbsd.tmp.gz ${.TARGET}
--- a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc
+++ b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2000/05/02 16:06:47 sjg Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2001/10/21 23:23:19 jmc Exp $

 # TOP is assumed to be defined by Makefile including this one.

@ -15,6 +15,7 @@ VND_CRDEV=	/dev/r${VND}d
 IMAGE?=		xxx.fs
 KERN?=		netbsd-xxx
 MDEC=		${DESTDIR}/usr/mdec
+MDSETIMAGE?=	mdsetimage

 LISTS=		${COMMONDIR}/list
 RAMDISK	!=cd $(.CURDIR)/../ramdisk/; \
@ -55,12 +56,13 @@ unconfig:

 netbsd.ram.gz: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	gzip netbsd.tmp
 	mv netbsd.tmp.gz ${.TARGET}

 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CLEANFILES}

+.include <bsd.own.mk>
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
--- a/distrib/hpcmips/Makefile
+++ b/distrib/hpcmips/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2001/04/22 02:04:22 shin Exp $
+#	$NetBSD: Makefile,v 1.5 2001/10/21 23:23:20 jmc Exp $

 .include "../Makefile.inc"

@ -15,6 +15,7 @@ IINST=		${INSTALL} ${RENAME} ${PRESERVE} ${COPY}	\
 PBSDBOOTDIR = ${KERNSRCDIR}/arch/${MACHINE}/stand/pbsdboot
 PBSDBOOT = ${PBSDBOOTDIR}/pbsdboot.exe
 PBSDBOOT1 = ${PBSDBOOTDIR}/pbsdboot1.exe
+MDSETIMAGE?=	mdsetimage

 INSTKERNELS = TX3912 TX3922

@ -29,7 +30,7 @@ MINIROOTOBJ != cd ${MINIROOTDIR}; ${MAKE} print-objdir
 release:
 	rm -f netbsd netbsd.gz
 	cp ${KERNOBJDIR}/RAMDISK/netbsd .
-	mdsetimage netbsd ${MINIROOTOBJ}/miniroot.fs
+	${MDSETIMAGE} netbsd ${MINIROOTOBJ}/miniroot.fs
 	gzip -9 netbsd
 	${IINST} netbsd.gz ${ITARGET}/.
 .for instkern in ${INSTKERNELS}
--- a/distrib/i386/floppies/kernel-ramdisk/Makefile
+++ b/distrib/i386/floppies/kernel-ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2001/07/21 14:46:09 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.6 2001/10/21 23:23:20 jmc Exp $

 TOP=		${.CURDIR}/..

@ -8,6 +8,7 @@ TOP=		${.CURDIR}/..

 MDEC=		${DESTDIR}/usr/mdec
 STRIP?=		strip
+MDSETIMAGE?=	${DESTDIR}/usr/sbin/mdsetimage

 #COMMONDIR=	${TOP}/bootfloppy-common
 #LISTS=		${COMMONDIR}/list
@ -23,7 +24,7 @@ RAMDISK_S!=	cd ${.CURDIR}/../ramdisk-small/; \

 netbsd.INSTALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
 	cp ${KERNOBJDIR}/INSTALL/netbsd netbsd.tmp
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	nm netbsd.tmp > netbsd.INSTALL.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
@ -31,7 +32,7 @@ netbsd.INSTALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}

 netbsd.INSTALL_LAPTOP.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd ${RAMDISK}
 	cp ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd netbsd.tmp
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	nm netbsd.tmp > netbsd.INSTALL_LAPTOP.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
@ -40,7 +41,7 @@ netbsd.INSTALL_LAPTOP.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd ${RAMDISK
 netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
 	cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
 	gdb --write -batch -x ${.CURDIR}/nocluster.gdb netbsd.tmp </dev/null
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_T}
 	nm netbsd.tmp > netbsd.INSTALL_TINY.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
@ -48,7 +49,7 @@ netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}

 netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S}
 	cp ${KERNOBJDIR}/INSTALL_SMALL/netbsd netbsd.tmp
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_S}
 	nm netbsd.tmp > netbsd.INSTALL_SMALL.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
@ -57,7 +58,7 @@ netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S
 netbsd.INSTALL_PS2.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_PS2/netbsd ${RAMDISK_S}
 	cp ${KERNOBJDIR}/INSTALL_PS2/netbsd netbsd.tmp
 	gdb --write -batch -x ${.CURDIR}/nocluster.gdb netbsd.tmp </dev/null
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_S}
 	nm netbsd.tmp > netbsd.INSTALL_PS2.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
--- a/distrib/i386/floppies/kernel-rescue/Makefile
+++ b/distrib/i386/floppies/kernel-rescue/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2001/06/24 12:09:04 veego Exp $
+#	$NetBSD: Makefile,v 1.4 2001/10/21 23:23:20 jmc Exp $

 TOP=		${.CURDIR}/..

@ -7,6 +7,7 @@ TOP=		${.CURDIR}/..
 .include <bsd.own.mk>

 MDEC=		${DESTDIR}/usr/mdec
+MDSETIMAGE?=	${DESTDIR}/usr/sbin/mdsetimage
 STRIP?=		strip

 RAMDISK_T!=	cd ${.CURDIR}/../ramdisk-rescuetiny/; \
@ -18,7 +19,7 @@ RAMDISK_S!=	cd ${.CURDIR}/../ramdisk-rescuesmall/; \

 netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
 	cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_T}
 	nm netbsd.tmp > netbsd.INSTALL_TINY.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
@ -26,7 +27,7 @@ netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}

 netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S}
 	cp ${KERNOBJDIR}/INSTALL_SMALL/netbsd netbsd.tmp
-	${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_S}
 	nm netbsd.tmp > netbsd.INSTALL_SMALL.symbols
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
--- a/distrib/mac68k/instkernel/instkernel/Makefile
+++ b/distrib/mac68k/instkernel/instkernel/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2000/09/23 13:53:42 simonb Exp $
+#	$NetBSD: Makefile,v 1.5 2001/10/21 23:23:20 jmc Exp $

 .include "../../../Makefile.inc"

@ -7,11 +7,12 @@ RAMDISK!=cd ${.CURDIR}/../ramdisk; \
 	${MAKE} -s -f-

 INSTALL_KERNEL?=INSTALL
+MDSETIMAGE?=	mdsetimage
 KERNEL=${KERNOBJDIR}/${INSTALL_KERNEL}/netbsd

 all:
 	cp ${KERNEL} netbsd-${INSTALL_KERNEL}
-	mdsetimage -T 0x0 -v netbsd-${INSTALL_KERNEL} ${RAMDISK}
+	${MDSETIMAGE} -T 0x0 -v netbsd-${INSTALL_KERNEL} ${RAMDISK}
 # XXX Doesn't boot with this. Why?
 #	strip netbsd-${INSTALL_KERNEL}
 # XXX Reported not to boot on some machines.
--- a/distrib/macppc/floppies/md-kernel/Makefile
+++ b/distrib/macppc/floppies/md-kernel/Makefile
@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2001/04/09 20:19:55 tsubai Exp $
+#	$NetBSD: Makefile,v 1.2 2001/10/21 23:23:20 jmc Exp $

 TOP= ${.CURDIR}/..

 .include "${TOP}/Makefile.inc"
+.include <bsd.own.mk>
 .include <bsd.kernobj.mk>

 STRIP?= strip
+MDSETIMAGE?=	mdsetimage

 KERNELS= netbsd.INSTALL.gz netbsd.GENERIC_MD.gz
 CLEANFILES+= ${KERNELS} netbsd
@ -17,14 +19,14 @@ all dependall: ${KERNELS}

 netbsd.INSTALL.gz: ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
 	cp ${KERNOBJDIR}/INSTALL/netbsd .
-	mdsetimage -v netbsd ${RAMDISK}
+	${MDSETIMAGE} -v netbsd ${RAMDISK}
 	${STRIP} netbsd
 	gzip -9 netbsd
 	mv netbsd.gz ${.TARGET}

 netbsd.GENERIC_MD.gz: ${KERNOBJDIR}/GENERIC_MD/netbsd ${RAMDISK}
 	cp ${KERNOBJDIR}/GENERIC_MD/netbsd .
-	mdsetimage -v netbsd ${RAMDISK}
+	${MDSETIMAGE} -v netbsd ${RAMDISK}
 	gzip -9 netbsd
 	mv netbsd.gz ${.TARGET}

--- a/distrib/mipsco/instkernel/Makefile
+++ b/distrib/mipsco/instkernel/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2001/03/05 05:07:45 wdk Exp $
+#	$NetBSD: Makefile,v 1.4 2001/10/21 23:23:21 jmc Exp $

 .include "../../../Makefile.inc"
 .include <bsd.kernobj.mk>
@ -6,6 +6,7 @@

 DISKBINDIR=	${RELEASEDIR}/installation/diskimage
 KERNBINDIR=	${RELEASEDIR}/binary/kernel
+MDSETIMAGE?=	mdsetimage

 IMAGE=		diskimage
 IMAGESIZE=	4096 # 512 byte blocks, update disktab.diskimage if changed
@ -34,7 +35,7 @@ realall:	${IMAGE}.gz

 netbsd.gz: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd
-	mdsetimage -v netbsd ${RAMDISK}
+	${MDSETIMAGE} -v netbsd ${RAMDISK}
 .ifdef ECOFF_KERNEL
 	elf2ecoff netbsd netbsd.ecoff
 	rm -f netbsd.ecoff.gz
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2001/10/21 03:30:36 chs Exp $
+#	$NetBSD: Makefile,v 1.13 2001/10/21 23:23:21 jmc Exp $

 TOP=		${.CURDIR}/..

@ -21,6 +21,7 @@ VND_CDEV=       /dev/${VND}c
 VND_CRDEV=      /dev/r${VND}c

 CRUNCHGEN?=	crunchgen
+MDSETIMAGE?=	mdsetimage
 MTREE?=		mtree

 # These are all the parameters for the root fs: (384K)
@ -33,7 +34,7 @@ CLEANFILES=	netbsd-rd ${IMAGE}

 netbsd-rd:	${IMAGE}
 	cp ${KERNEL} netbsd-tmp
-	mdsetimage netbsd-tmp ${IMAGE}
+	${MDSETIMAGE} netbsd-tmp ${IMAGE}
 	-mv -f netbsd-tmp $@

 ${IMAGE}:	${TREE} ${LISTS} ${CBIN}
--- a/distrib/news68k/floppies/ramdisk-kernel/Makefile
+++ b/distrib/news68k/floppies/ramdisk-kernel/Makefile
@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2001/01/07 08:39:34 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.4 2001/10/21 23:23:21 jmc Exp $

 TOP=		${.CURDIR}/..

 .include "${TOP}/Makefile.inc"
 .include <bsd.kernobj.mk>
+.include <bsd.own.mk>
 .include <bsd.subdir.mk>

 KERN=		${KERNOBJDIR}/INSTALL/netbsd
@ -12,12 +13,13 @@ RAMDISK=	${RAMDISKDIR}/ramdisk.fs
 KERNEL=		netbsd.INSTALL.gz

 CLEANFILES+=	${KERNEL} netbsd.tmp netbsd.tmp.gz
+MDSETIMAGE?=	mdsetimage

 all:	${KERNEL}

 ${KERNEL}: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	gzip -9 netbsd.tmp
 	mv netbsd.tmp.gz ${.TARGET}

--- a/distrib/newsmips/floppies/bootfloppy/Makefile
+++ b/distrib/newsmips/floppies/bootfloppy/Makefile
@ -1,14 +1,16 @@
-#	$NetBSD: Makefile,v 1.2 2000/05/02 16:06:52 sjg Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/21 23:23:21 jmc Exp $

 TOP=		${.CURDIR}/..

 .include "${TOP}/Makefile.inc"
 .include <bsd.kernobj.mk>
+.include <bsd.own.mk>

 IMAGE=		boot.fs
 KERN=		${KERNOBJDIR}/INSTALL/netbsd

 MOUNT_POINT?=	/mnt
+MDSETIMAGE?=	mdsetimage
 VND?=		vnd0
 VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
@ -61,7 +63,7 @@ unconfig:

 netbsd.ram.gz: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	gzip -9 netbsd.tmp
 	mv netbsd.tmp.gz ${.TARGET}

--- a/distrib/pc532/floppies/inst-common/Makefile.inc
+++ b/distrib/pc532/floppies/inst-common/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.19 2001/10/21 23:20:05 jmc Exp $ 
+#	$NetBSD: Makefile.inc,v 1.20 2001/10/21 23:23:22 jmc Exp $ 

 # TOP is assumed to be defined by Makefile including this one.

@ -20,6 +20,7 @@ MTREECONF=	${COMMONDIR}/mtree.conf
 KERNEL?=	${KERNOBJDIR}/INSTALL/netbsd

 CRUNCHGEN?=	crunchgen
+MDSETIMAGE?=	mdsetimage
 MTREE?=		mtree
 STRIP?=		strip

@ -83,7 +84,7 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c

 netbsd.gz: ramdisk.fs
 	cp ${KERNEL} /var/tmp/$$$$; \
-		mdsetimage -v /var/tmp/$$$$ ramdisk.fs; \
+		${MDSETIMAGE} -v /var/tmp/$$$$ ramdisk.fs; \
 		${STRIP} /var/tmp/$$$$; \
 		gzip -9 </var/tmp/$$$$ >netbsd.gz; \
 		rm /var/tmp/$$$$
@ -93,5 +94,6 @@ clean cleandir distclean:
 	/bin/rm -f netbsd*

 .include <bsd.kernobj.mk>
+.include <bsd.own.mk>
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
--- a/distrib/playstation2/Makefile
+++ b/distrib/playstation2/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/10/15 16:22:50 uch Exp $
+#	$NetBSD: Makefile,v 1.2 2001/10/21 23:23:22 jmc Exp $

 .include "../Makefile.inc"

@ -19,11 +19,12 @@ release:
 .else
 MINIROOTDIR = ${.CURDIR}/../miniroot
 MINIROOTOBJ != cd ${MINIROOTDIR}; ${MAKE} print-objdir
+MDSETIMAGE?=	mdsetimage

 release:
 	rm -f netbsd netbsd.gz
 	cp ${KERNOBJDIR}/RAMDISK/netbsd .
-	mdsetimage netbsd ${MINIROOTOBJ}/miniroot.fs
+	${MDSETIMAGE} netbsd ${MINIROOTOBJ}/miniroot.fs
 	gzip -9 netbsd
 	${IINST} netbsd.gz ${ITARGET}/.
 	${.CURDIR}/../sets/makesums -t ${ITARGET} '*.gz'
--- a/distrib/pmax/instkernel/Makefile
+++ b/distrib/pmax/instkernel/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2001/03/24 15:31:23 simonb Exp $
+#	$NetBSD: Makefile,v 1.20 2001/10/21 23:23:22 jmc Exp $

 .include "../../../Makefile.inc"
 .include <bsd.kernobj.mk>
@ -22,12 +22,13 @@ VND?=		vnd0
 VND_DEV=	/dev/${VND}c
 VND_RDEV=	/dev/r${VND}c
 MOUNT_POINT?=	/mnt
+MDSETIMAGE?=	mdsetimage

 all:	netbsd.gz ${IMAGE}.gz

 netbsd.gz: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd
-	mdsetimage -v netbsd ${RAMDISK}
+	${MDSETIMAGE} -v netbsd ${RAMDISK}
 	elf2ecoff netbsd netbsd.ecoff
 	rm -f netbsd.ecoff.gz
 	gzip -9 netbsd.ecoff
--- a/distrib/prep/floppies/bootfloppy-common/Makefile.inc
+++ b/distrib/prep/floppies/bootfloppy-common/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 2001/01/16 16:53:58 nonaka Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2001/10/21 23:23:22 jmc Exp $

 TOP=		${.CURDIR}/..

@ -33,4 +33,5 @@ release:
 clean cleandir distclean:
 	rm -f *.core ${IMAGE} ${CLEANFILES}

+.include <bsd.own.mk>
 .include <bsd.obj.mk>
--- a/distrib/prep/floppies/kernel-ramdisk/Makefile
+++ b/distrib/prep/floppies/kernel-ramdisk/Makefile
@ -1,15 +1,17 @@
-#	$NetBSD: Makefile,v 1.1 2001/01/16 16:53:59 nonaka Exp $
+#	$NetBSD: Makefile,v 1.2 2001/10/21 23:23:22 jmc Exp $

 TOP=		${.CURDIR}/..

 .include "${TOP}/Makefile.inc"
 .include <bsd.kernobj.mk>
+.include <bsd.own.mk>
 .include <bsd.subdir.mk>

 KERN=		${KERNOBJDIR}/INSTALL/netbsd
 RAMDISKDIR!=	cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
 RAMDISK=	${RAMDISKDIR}/ramdisk.fs
 KERNEL=		netbsd.INSTALL.gz
+MDSETIMAGE?=	mdsetimage

 CLEANFILES+=	${KERNEL} netbsd.tmp netbsd.tmp.gz

@ -17,7 +19,7 @@ all:	${KERNEL}

 ${KERNEL}: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	gzip -9 netbsd.tmp
 	mv netbsd.tmp.gz ${.TARGET}

--- a/distrib/sparc/bootfs/Makefile
+++ b/distrib/sparc/bootfs/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2001/10/21 23:21:53 jmc Exp $
+#	$NetBSD: Makefile,v 1.29 2001/10/21 23:23:23 jmc Exp $
 #
 # boot.fs is the image for disk 1 of the two-set floppy based installation
 # method.
@ -27,6 +27,7 @@ FD?=		fd0
 FD_RDEV=	/dev/r${FD}a
 IMAGE?=		boot.fs
 MDEC=		${DESTDIR}/usr/mdec
+MDSETIMAGE?=	mdsetimage
 OBJCOPY?=	objcopy

 LISTS=		${.CURDIR}/list
@ -71,7 +72,7 @@ unconfig:

 netbsd.ram: ${KERN} ${RAMDISK}
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	strip netbsd.tmp
 	mv netbsd.tmp ${.TARGET}

--- a/distrib/sparc64/xminiroot/Makefile
+++ b/distrib/sparc64/xminiroot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2001/10/13 06:15:20 jmc Exp $
+#	$NetBSD: Makefile,v 1.8 2001/10/21 23:23:23 jmc Exp $

 TOP=		${.CURDIR}/..
 MINIROOT=	${TOP}/../miniroot
@ -52,6 +52,7 @@ CRUNCHCONF=	${CBIN}.conf
 MTREECONF=	mtree.conf

 CRUNCHGEN?=	crunchgen
+MDSETIMAGE?=	mdsetimage
 MTREE?=		mtree
 DISKTYPE?=	miniroot

@ -59,7 +60,7 @@ all: netbsd.INSTALL ${IMAGE}

 netbsd.INSTALL: ${KERN} ${IMAGE}
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${IMAGE}
+	${MDSETIMAGE} -v netbsd.tmp ${IMAGE}
 	strip netbsd.tmp
 	mv netbsd.tmp ${.TARGET}

--- a/distrib/sun2/ramdisk/Makefile
+++ b/distrib/sun2/ramdisk/Makefile
@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2001/10/13 06:15:20 jmc Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/21 23:23:23 jmc Exp $

 TOP=		${.CURDIR}/..

 # This include just sets REV=XX
 .include "${TOP}/Makefile.inc"
+.include <bsd.own.mk>

 IMAGE=	ramdisk
 CBIN=	rd_bin
@ -14,6 +15,7 @@ LISTS=	${TOP}/common/${CBIN}.list \
 	${TOP}/common/${IMAGE}.list

 KERNEL  = ${KERNOBJDIR}/RAMDISK/netbsd
+MDSETIMAGE?=	mdsetimage

 MOUNT_POINT?=	/mnt
 VND?=		vnd1
@ -34,7 +36,7 @@ all: $(KERNELS)

 netbsd.RAMDISK : ${IMAGE}.fs
 	cp ${KERNEL} netbsd-tmp
-	mdsetimage -v netbsd-tmp ${IMAGE}.fs
+	${MDSETIMAGE} -v netbsd-tmp ${IMAGE}.fs
 	-mv -f netbsd-tmp $@

 ${IMAGE}.fs: ${TREE} ${LISTS} ${CBIN}
--- a/distrib/sun3/ramdisk/Makefile
+++ b/distrib/sun3/ramdisk/Makefile
@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.19 2001/10/13 06:15:21 jmc Exp $
+#	$NetBSD: Makefile,v 1.20 2001/10/21 23:23:23 jmc Exp $

 TOP=		${.CURDIR}/..

 # This include just sets REV=XX
 .include "${TOP}/Makefile.inc"
+.include <bsd.own.mk>

 IMAGE=	ramdisk
 CBIN=	rd_bin
@ -26,6 +27,7 @@ DISKTYPE=	rdroot
 SIZE=		400k
 # bigendian, minfree, opt, b/i , cpg
 NEWFSARGS= -B be -m 0 -o space -i 4096 -c 20
+MDSETIMAGE?=	mdsetimage
 MTREE?=		mtree

 KERNELS= netbsd.RAMDISK netbsd.RAMDISK3X
@ -35,12 +37,12 @@ all: $(KERNELS)

 netbsd.RAMDISK : ${IMAGE}.fs
 	cp ${KERNEL3} netbsd-tmp
-	mdsetimage -v netbsd-tmp ${IMAGE}.fs
+	${MDSETIMAGE} -v netbsd-tmp ${IMAGE}.fs
 	-mv -f netbsd-tmp $@

 netbsd.RAMDISK3X : ${IMAGE}.fs
 	cp ${KERNEL3X} netbsd-tmp
-	mdsetimage -v netbsd-tmp ${IMAGE}.fs
+	${MDSETIMAGE} -v netbsd-tmp ${IMAGE}.fs
 	-mv -f netbsd-tmp $@

 ${IMAGE}.fs: ${TREE} ${LISTS} ${CBIN}
--- a/distrib/vax/ramdisk-kernel/Makefile
+++ b/distrib/vax/ramdisk-kernel/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/03/04 20:33:03 matt Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/21 23:23:23 jmc Exp $

 TOP=		${.CURDIR}/..

@ -8,13 +8,14 @@ TOP=		${.CURDIR}/..

 MDEC=		${DESTDIR}/usr/mdec
 STRIP?=		strip
+MDSETIMAGE?=	${DESTDIR}/usr/sbin/mdsetimage

 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}/ramdisk.fs
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}/ramdisk.fs
 	${STRIP} netbsd.tmp
 	gzip -9 netbsd.tmp
 	mv netbsd.tmp.gz ${.TARGET}
--- a/distrib/x68k/floppies/bootfloppy-common/Makefile.inc
+++ b/distrib/x68k/floppies/bootfloppy-common/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.16 2000/11/28 03:03:26 minoura Exp $
+#	$NetBSD: Makefile.inc,v 1.17 2001/10/21 23:23:24 jmc Exp $

 # TOP is assumed to be defined by Makefile including this one.

@ -18,6 +18,7 @@ KERN?=		netbsd-xxx
 KERNNAME?=	netbsd.xxx
 GZNAME?=	${KERNNAME}.gz
 MDEC=		${DESTDIR}/usr/mdec
+MDSETIMAGE?=	mdsetimage

 LISTS=		${COMMONDIR}/list
 .if ${RAMDISKDIR} != ""
@ -61,7 +62,7 @@ unconfig:
 ${KERNNAME}: ${KERN} ${RAMDISK}
 	-/bin/rm -f netbsd.tmp*
 	cp ${KERN} netbsd.tmp
-	mdsetimage -v netbsd.tmp ${RAMDISK}
+	${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
 	mv -f netbsd.tmp ${.TARGET}
 .else
 ${KERNNAME}: ${KERN}
@ -86,4 +87,5 @@ release:
 clean cleandir distclean:
 	/bin/rm -f *.core ${IMAGE} ${CLEANFILES}

+.include <bsd.own.mk>
 .include <bsd.obj.mk>