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.10
retrieving revision 1.19
diff -u -p -r1.10 -r1.19
--- src/distrib/common/Makefile.makedev	2004/05/04 02:52:05	1.10
+++ src/distrib/common/Makefile.makedev	2014/08/10 05:56:36	1.19
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.makedev,v 1.10 2004/05/04 02:52:05 lukem Exp $
+#	$NetBSD: Makefile.makedev,v 1.19 2014/08/10 05:56:36 matt 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.
@@ -41,13 +41,22 @@ CLEANFILES+=	${MAKEDEVSPEC} ${MAKEDEVSPE
 #
 MTREECONF+=	${MAKEDEVSPEC}
 
-${MAKEDEVSPEC}:	${MAKEDEVSCRIPT}
+.if exists(${NETBSDSRCDIR}/etc/etc.${MACHINE_CPU}/MAKEDEV.conf)
+MAKEDEV_MACHINE=${MACHINE_CPU}
+.else
+MAKEDEV_MACHINE=${MACHINE}
+.endif
+
+${MAKEDEVSPEC}:	${MAKEDEVSCRIPT} Makefile \
+		${NETBSDSRCDIR}/etc/etc.${MAKEDEV_MACHINE}/MAKEDEV.conf
+		
 	${_MKTARGET_CREATE}
-	-rm -f ${.TARGET} ${.TARGET}.tmp
-	MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	rm -f ${.TARGET} ${.TARGET}.tmp
+	MACHINE=${MAKEDEV_MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
 	    ${HOST_SH} ${MAKEDEVSCRIPT} -s ${MAKEDEVTARGETS} \
-	    | sed -e 's,^\.,./dev,' > ${.TARGET}.tmp \
-	&& sort -o ${.TARGET} ${.TARGET}.tmp
+	    > ${.TARGET}.tmp
+	${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' ${.TARGET}.tmp \
+	    | sort -o ${.TARGET}
 
 .else	# ! MAKEDEVTARGETS