Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/distrib/common/Makefile.makedev,v
rcsdiff: /ftp/cvs/cvsroot/src/distrib/common/Makefile.makedev,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- src/distrib/common/Makefile.makedev	2007/03/01 09:20:59	1.12
+++ src/distrib/common/Makefile.makedev	2008/10/25 22:27:34	1.15
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.makedev,v 1.12 2007/03/01 09:20:59 apb Exp $
+#	$NetBSD: Makefile.makedev,v 1.15 2008/10/25 22:27:34 apb Exp $
 #
 # Makefile snippet to add ${MAKEDEVTARGETS} devices to the mtree list
-# (if set), otherwise copy .OJBDIR-of-etc/MAKEDEV to ./dev
+# (if set), otherwise copy .OBJDIR-of-etc/MAKEDEV to ./dev
 #
 # If this is to be used with Makefile.image, then this file should be
 # .include-d first.
@@ -15,11 +15,10 @@
 #
 # Variables modified by this:
 #	MAKEDEVSCRIPT	path to .OBJDIR-of-etc/MAKEDEV
-#	MAKEDEVSUBR	path to .OBJDIR-of-etc/MAKEDEV.subr
 #	MTREECONF	may get "devices.spec" added
 #	LISTS		may get "list.makedev" added
-#	IMAGEDEPENDS	may get ${MAKEDEVSCRIPT} and ${MAKEDEVSUBR} added
-#	PARSELISTENV	may get MAKEDEVSCRIPT=... and MAKEDEVSUBR=... added
+#	IMAGEDEPENDS	may get ${MAKEDEVSCRIPT} added
+#	PARSELISTENV	may get MAKEDEVSCRIPT=... added
 #
 
 .if !defined(_MAKEFILE_MAKEDEV_)
@@ -30,7 +29,6 @@ MAKEDEVSPEC?=	devices.spec
 
 _MAKEDEVOBJDIR!=cd ${NETBSDSRCDIR}/etc && ${PRINTOBJDIR}
 MAKEDEVSCRIPT=	${_MAKEDEVOBJDIR}/MAKEDEV
-MAKEDEVSUBR=	${_MAKEDEVOBJDIR}/MAKEDEV.subr
 
 CLEANFILES+=	${MAKEDEVSPEC} ${MAKEDEVSPEC}.tmp
 
@@ -43,12 +41,13 @@ CLEANFILES+=	${MAKEDEVSPEC} ${MAKEDEVSPE
 #
 MTREECONF+=	${MAKEDEVSPEC}
 
-${MAKEDEVSPEC}:	${MAKEDEVSCRIPT} ${MAKEDEVSUBR}
+${MAKEDEVSPEC}:	${MAKEDEVSCRIPT}
 	${_MKTARGET_CREATE}
 	-rm -f ${.TARGET} ${.TARGET}.tmp
 	MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
 	    ${HOST_SH} ${MAKEDEVSCRIPT} -s ${MAKEDEVTARGETS} \
-	    | sed -e '/^\. type=dir/d' -e 's,^\.,./dev,' > ${.TARGET}.tmp \
+	    | ${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' \
+	    > ${.TARGET}.tmp \
 	&& sort -o ${.TARGET} ${.TARGET}.tmp
 
 .else	# ! MAKEDEVTARGETS
@@ -59,9 +58,8 @@ ${MAKEDEVSPEC}:	${MAKEDEVSCRIPT} ${MAKED
 #	(effectively) running "cd /dev ; ./MAKEDEV all"
 #
 LISTS+=		${DISTRIBDIR}/common/list.makedev
-IMAGEDEPENDS+=	${MAKEDEVSCRIPT} ${MAKEDEVSUBR}
+IMAGEDEPENDS+=	${MAKEDEVSCRIPT}
 PARSELISTENV+=	MAKEDEVSCRIPT=${MAKEDEVSCRIPT:Q}
-PARSELISTENV+=	MAKEDEVSUBR=${MAKEDEVSUBR:Q}
 
 ${MAKEDEVSPEC}:	.PHONY