diff --git a/distrib/acorn32/Makefile b/distrib/acorn32/Makefile index 87c8ddb64f88..2a0b0d8fc81d 100644 --- a/distrib/acorn32/Makefile +++ b/distrib/acorn32/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2002/02/16 01:53:52 reinoud Exp $ +# $NetBSD: Makefile,v 1.6 2002/03/05 21:23:30 thorpej Exp $ + +.include ITARGET= ${RELEASEDIR}/installation IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} diff --git a/distrib/alpha/instkernel/cd-hd-tape/Makefile b/distrib/alpha/instkernel/cd-hd-tape/Makefile index 21a07ba15798..2a3d8024d207 100644 --- a/distrib/alpha/instkernel/cd-hd-tape/Makefile +++ b/distrib/alpha/instkernel/cd-hd-tape/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/03/05 19:57:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2002/03/05 21:23:28 thorpej Exp $ + +.include IMAGE= cdhdtape IMAGESIZE= 5760 @@ -62,5 +64,4 @@ clean cleandir distclean: # nothing to do here depend includes lint regress tags: -.include .include diff --git a/distrib/alpha/instkernel/fdset/Makefile b/distrib/alpha/instkernel/fdset/Makefile index 07e02745aecb..335263ab6cae 100644 --- a/distrib/alpha/instkernel/fdset/Makefile +++ b/distrib/alpha/instkernel/fdset/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/03/05 19:57:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 2002/03/05 21:23:28 thorpej Exp $ + +.include IMAGE1= disk1of2 IMAGE2= disk2of2 @@ -63,5 +65,4 @@ clean cleandir distclean: # nothing to do here depend includes lint regress tags: -.include .include diff --git a/distrib/alpha/instkernel/instkernel/Makefile b/distrib/alpha/instkernel/instkernel/Makefile index a47bf192d62e..e014b3c5e2d9 100644 --- a/distrib/alpha/instkernel/instkernel/Makefile +++ b/distrib/alpha/instkernel/instkernel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2002/03/05 19:57:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.16 2002/03/05 21:23:28 thorpej Exp $ .include "../../../../Makefile.inc" +.include RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs @@ -28,5 +29,4 @@ release: depend includes lint regress tags: .include -.include .include diff --git a/distrib/arm32/Makefile b/distrib/arm32/Makefile index 082fc4854405..fb94205e8ec1 100644 --- a/distrib/arm32/Makefile +++ b/distrib/arm32/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/02/09 13:56:49 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2002/03/05 21:23:29 thorpej Exp $ + +.include ITARGET= ${RELEASEDIR}/installation IINST= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} diff --git a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc index c902d26d85fe..f384a71bb2b5 100644 --- a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc +++ b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc @@ -1,10 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.6 2002/03/05 20:01:34 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.7 2002/03/05 21:23:29 thorpej Exp $ # TOP is assumed to be defined by Makefile including this one. COMMONDIR= ${TOP}/bootfloppy-common .include +.include MOUNT_POINT?= /mnt VND?= vnd0 @@ -63,6 +64,5 @@ netbsd.ram.gz: ${KERN} ${RAMDISK} clean cleandir: /bin/rm -f *.core ${IMAGE} ${CLEANFILES} -.include .include .include diff --git a/distrib/hpcmips/Makefile b/distrib/hpcmips/Makefile index 25f44dc8472b..64b92e42c138 100644 --- a/distrib/hpcmips/Makefile +++ b/distrib/hpcmips/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2002/02/18 03:38:01 shin Exp $ +# $NetBSD: Makefile,v 1.9 2002/03/05 21:23:29 thorpej Exp $ .include "../Makefile.inc" .include .include +.include SUBDIR= diff --git a/distrib/mac68k/instkernel/ramdisk/Makefile b/distrib/mac68k/instkernel/ramdisk/Makefile index c2fe8c7c1dcf..dae432655a5f 100644 --- a/distrib/mac68k/instkernel/ramdisk/Makefile +++ b/distrib/mac68k/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/03/05 20:41:29 thorpej Exp $ +# $NetBSD: Makefile,v 1.14 2002/03/05 21:23:29 thorpej Exp $ .include @@ -67,5 +67,4 @@ clean cleandir distclean: .INTERRUPT: unconfig -.include .include diff --git a/distrib/news68k/floppies/bootfloppy/Makefile b/distrib/news68k/floppies/bootfloppy/Makefile index d46da5914cfb..13df366987c7 100644 --- a/distrib/news68k/floppies/bootfloppy/Makefile +++ b/distrib/news68k/floppies/bootfloppy/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2001/11/09 20:52:19 tsutsui Exp $ +# $NetBSD: Makefile,v 1.9 2002/03/05 21:23:29 thorpej Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" +.include .include IMAGE= boot.fs diff --git a/distrib/newsmips/floppies/bootfloppy/Makefile b/distrib/newsmips/floppies/bootfloppy/Makefile index ffc2009bf7a8..5922fe5d6987 100644 --- a/distrib/newsmips/floppies/bootfloppy/Makefile +++ b/distrib/newsmips/floppies/bootfloppy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/05 20:43:33 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2002/03/05 21:23:30 thorpej Exp $ TOP= ${.CURDIR}/.. @@ -84,5 +84,4 @@ clean cleandir distclean: real-floppy: dd if=${IMAGE} of=${FD_RDEV} bs=45k -.include .include diff --git a/distrib/playstation2/Makefile b/distrib/playstation2/Makefile index 4de614c2b2ab..2d0308bac3e0 100644 --- a/distrib/playstation2/Makefile +++ b/distrib/playstation2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/02/09 13:56:52 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2002/03/05 21:23:31 thorpej Exp $ .include "../Makefile.inc" +.include .include .include diff --git a/distrib/prep/floppies/bootfloppy-common/Makefile.inc b/distrib/prep/floppies/bootfloppy-common/Makefile.inc index fe3daed00d37..37b2cf8d3bdf 100644 --- a/distrib/prep/floppies/bootfloppy-common/Makefile.inc +++ b/distrib/prep/floppies/bootfloppy-common/Makefile.inc @@ -1,8 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.2 2001/10/21 23:23:22 jmc Exp $ +# $NetBSD: Makefile.inc,v 1.3 2002/03/05 21:23:30 thorpej Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" +.include .include IMAGE?= boot.fs @@ -33,5 +34,4 @@ release: clean cleandir distclean: rm -f *.core ${IMAGE} ${CLEANFILES} -.include .include diff --git a/distrib/shark/instkernel/instkernel/Makefile b/distrib/shark/instkernel/instkernel/Makefile index d7b70b189880..ed7005d26fde 100644 --- a/distrib/shark/instkernel/instkernel/Makefile +++ b/distrib/shark/instkernel/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/03/05 21:16:51 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 2002/03/05 21:23:31 thorpej Exp $ .include @@ -33,5 +33,4 @@ release: depend includes lint regress tags: .include -.include .include diff --git a/distrib/sparc64/instfs/Makefile b/distrib/sparc64/instfs/Makefile index ab351ed01b1f..dce056d59290 100644 --- a/distrib/sparc64/instfs/Makefile +++ b/distrib/sparc64/instfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/05 21:16:52 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2002/03/05 21:23:30 thorpej Exp $ # # instfs.tgz is the filesystem image for disk 2 of the floppy based # installation method. @@ -10,6 +10,7 @@ TOP= ${.CURDIR}/.. MINIROOT= ${.CURDIR}/../xminiroot .include "${TOP}/Makefile.inc" +.include MINIROOT_DIR!= cd ${MINIROOT} && ${PRINTOBJDIR} MINIROOT_IMAGE= ${MINIROOT_DIR}/miniroot.fs diff --git a/distrib/vax/ramdisk-kernel/Makefile b/distrib/vax/ramdisk-kernel/Makefile index dce6c6b7afac..eb14f1d45a91 100644 --- a/distrib/vax/ramdisk-kernel/Makefile +++ b/distrib/vax/ramdisk-kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/21 23:23:23 jmc Exp $ +# $NetBSD: Makefile,v 1.4 2002/03/05 21:23:30 thorpej Exp $ TOP= ${.CURDIR}/.. @@ -31,6 +31,5 @@ release: clean cleandir distclean: rm -f *.core ${KERNELS} -.include .include .include