- set ${TOP} to ${.CURDIR}/.., and use as appropriate

- use ${DISTRIBDIR} as appropriate
- migrate most of mtree.conf to ${DISTRIBDIR}/common/mtree.common,
  leaving /.profile in mtree.conf
- remove MAKEDEV_DEVS support; replaced with MAKEDEVTARGETS support in
  ${DISTRIBDIR}/common/Makefile.makedev

distrib/i386/floppies/common/Makefile.ramdisk

@@ -1,15 +1,17 @@
-#	$NetBSD: Makefile.ramdisk,v 1.3 2002/02/06 16:12:18 lukem Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.4 2002/02/08 04:52:42 lukem Exp $
 
-.include "../Makefile.inc"
+TOP=	${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
 .include <bsd.own.mk>
 
-.PATH:		${.CURDIR}/../common
+.PATH:		${TOP}/common
 
 WARNS=		1
 
 CRUNCHBIN=	ramdiskbin
-LISTS=		${.CURDIR}/list ${.CURDIR}/../common/list.ramdisk
-MTREECONF=	${.CURDIR}/../common/mtree.conf
+LISTS=		${.CURDIR}/list ${TOP}/common/list.ramdisk
+MTREECONF=	${DISTRIBDIR}/common/mtree.common ${TOP}/common/mtree.conf
 IMAGEENDIAN=	le
 IMAGEDEPENDS+= 	${CRUNCHBIN} dot.profile termcap.mini \
 		${_SRC_TOP_}/etc/group ${_SRC_TOP_}/etc/master.passwd \
@@ -19,34 +21,9 @@ IMAGEDEPENDS+= 	${CRUNCHBIN} dot.profile termcap.mini \
 POPULATEENV+=	BOOTMODEL=${BOOTMODEL:Q}
 
 
-.if defined(MAKEDEV_DEVS)
-#
-#	MAKEDEV_DEVS is set; add those devices to the mtree spec that's
-#	used to build the file system
-#
-MAKEDEVSCRIPT=	${_SRC_TOP_}/etc/etc.i386/MAKEDEV
-_MAKEDEVWRAP=	${_SRC_TOP_}/distrib/common/MAKEDEV.wrapper
-_MAKEDEV2SPEC=	${_SRC_TOP_}/distrib/common/makedev2spec.awk
-
-MAKEDEVSPEC=	devices.spec
-MTREECONF+=	${MAKEDEVSPEC}
-
-${MAKEDEVSPEC}:	${MAKEDEVSCRIPT} ${_MAKEDEVWRAP} ${_MAKEDEV2SPEC}
-	-rm -f ${.TARGET} ${.TARGET}.tmp
-	MAKEDEVSCRIPT=${MAKEDEVSCRIPT:Q} sh ${_MAKEDEVWRAP} ${MAKEDEV_DEVS} | \
-	    awk -f ${_MAKEDEV2SPEC} > ${.TARGET}.tmp \
-	&& sort -o ${.TARGET} ${.TARGET}.tmp
-
-CLEANFILES+=	${MAKEDEVSPEC} ${MAKEDEVSPEC}.tmp
-
-.else	# ! MAKEDEV_DEVS
-#
-#	MAKEDEV_DEVS isn't set; copy in /dev/MAKEDEV and rely upon
-#	init(8) to mount an mfs /dev and recreated the devices
-#
-LISTS+=		${.CURDIR}/../common/list.makedev
-IMAGEDEPENDS+=	${_SRC_TOP_}/etc/etc.i386/MAKEDEV
-.endif	# ! MAKEDEV_DEVS
+.if defined(USE_SYSINST)
+LISTS+=		${DISTRIBDIR}/common/list.sysinst
+.endif
 
 
 realall: ${IMAGE}
@@ -65,7 +42,9 @@ ${CRUNCHBIN}: libhack.o
 
 release:
 
-.include "${_SRC_TOP_}/distrib/common/Makefile.crunch"
-.include "${_SRC_TOP_}/distrib/common/Makefile.image"
+
+.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.makedev"
+.include "${DISTRIBDIR}/common/Makefile.image"
 
 .include <bsd.prog.mk>

distrib/i386/floppies/common/list.makedev

@@ -1,3 +0,0 @@
-#	$NetBSD: list.makedev,v 1.1 2002/02/06 16:12:18 lukem Exp $
-
-COPY	${_SRC_TOP_}/etc/etc.i386/MAKEDEV	dev/MAKEDEV

distrib/i386/floppies/common/mtree.conf

@@ -1,37 +1,3 @@
-#	$NetBSD: mtree.conf,v 1.2 2002/02/06 16:09:14 lukem Exp $
+#	$NetBSD: mtree.conf,v 1.3 2002/02/08 04:52:43 lukem Exp $
 
-/set			type=dir uname=root gname=wheel mode=0755
-
-.
-./.profile		type=file mode=0644
-./bin
-./dev
-./dist
-./dist/base_obsolete	type=file
-./dist/comp_obsolete	type=file
-./dist/etc_obsolete	type=file
-./dist/games_obsolete	type=file
-./dist/man_obsolete	type=file
-./dist/misc_obsolete	type=file
-./dist/text_obsolete	type=file
-./dist/xbase_obsolete	type=file
-./dist/xcomp_obsolete	type=file
-./dist/xserver_obsolete	type=file
-./etc
-./mnt
-./mnt2
-./kern
-./sbin
-./tmp			mode=01777
-./usr
-./usr/bin
-./usr/mdec
-./usr/sbin
-./usr/share
-./usr/share/misc
-./var
-./var/db
-./var/run
-./var/log
-./var/spool
-./var/spool/lock
+./.profile		type=file uname=root gname=wheel mode=0644