Index: Makefile
===================================================================
RCS file: /cvsroot/src/etc/mtree/Makefile,v
retrieving revision 1.40
diff -p -u -r1.40 Makefile
--- Makefile	17 Feb 2019 05:29:08 -0000	1.40
+++ Makefile	12 Mar 2019 05:13:42 -0000
@@ -2,8 +2,10 @@
 
 .include <bsd.own.mk>
 
+EXTRA_DIST_FILES=	NetBSD.dist.machine	# autogenerated
+
 .if ${MKX11} != "no"
-EXTRA_DIST_FILES=	NetBSD.dist.Xorg
+EXTRA_DIST_FILES+=	NetBSD.dist.Xorg
 .endif
 
 # Derived from MACHINE_CPU, but keeping 32/64bit for most.
@@ -77,6 +79,10 @@ NetBSD.dist:	NetBSD.dist.tmp
 NetBSD.dist.tmp: NetBSD.dist.base ${EXTRA_DIST_FILES}
 	${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
 
+NetBSD.dist.machine:
+	${MKCREATE}
+	echo ./usr/include/${MACHINE} > ${.TARGET}
+
 NetBSD.dist.compat: NetBSD.dist.compat.in mkcompat.awk
 	${MKCREATE}
 	${TOOL_AWK} -f ${.ALLSRC:M*.awk} -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \
@@ -130,6 +136,7 @@ distrib-dirs: .PHONY check_DESTDIR NetBS
 .endif	# DISTRIBUTION_DONE						# }
 
 CLEANFILES+=	NetBSD.dist NetBSD.dist.tmp
+CLEANFILES+=	NetBSD.dist.machine
 CLEANFILES+=	NetBSD.dist.compat
 CLEANFILES+=	NetBSD.dist.tests.compat
 
Index: NetBSD.dist.aarch64
===================================================================
RCS file: NetBSD.dist.aarch64
diff -N NetBSD.dist.aarch64
--- NetBSD.dist.aarch64	17 Feb 2019 05:29:08 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#	$NetBSD: NetBSD.dist.aarch64,v 1.6 2019/02/17 05:29:08 mrg Exp $
-
-./usr/include/aarch64
Index: NetBSD.dist.i386
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.i386,v
retrieving revision 1.1
diff -p -u -r1.1 NetBSD.dist.i386
--- NetBSD.dist.i386	9 Feb 2019 00:15:28 -0000	1.1
+++ NetBSD.dist.i386	12 Mar 2019 05:13:42 -0000
@@ -1,5 +1,4 @@
 #	$NetBSD: NetBSD.dist.i386,v 1.1 2019/02/09 00:15:28 mrg Exp $
 
-./usr/include/i386
 ./usr/include/x86
 ./usr/include/xen
Index: NetBSD.dist.ia64
===================================================================
RCS file: NetBSD.dist.ia64
diff -N NetBSD.dist.ia64
--- NetBSD.dist.ia64	17 Feb 2019 05:29:08 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#	$NetBSD: NetBSD.dist.ia64,v 1.1 2019/02/17 05:29:08 mrg Exp $
-
-./usr/include/ia64
Index: NetBSD.dist.ofppc
===================================================================
RCS file: NetBSD.dist.ofppc
diff -N NetBSD.dist.ofppc
--- NetBSD.dist.ofppc	1 Mar 2019 04:39:37 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#	$NetBSD: NetBSD.dist.ofppc,v 1.1 2019/03/01 04:39:37 mrg Exp $
-
-./usr/include/ofppc
Index: NetBSD.dist.powerpc
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.powerpc,v
retrieving revision 1.1
diff -p -u -r1.1 NetBSD.dist.powerpc
--- NetBSD.dist.powerpc	17 Feb 2019 05:29:08 -0000	1.1
+++ NetBSD.dist.powerpc	12 Mar 2019 05:13:42 -0000
@@ -1,3 +1,5 @@
 #	$NetBSD: NetBSD.dist.powerpc,v 1.1 2019/02/17 05:29:08 mrg Exp $
 
 ./usr/include/powerpc
+./usr/include/powerpc/oea
+./usr/include/powerpc/ibm4xx
Index: NetBSD.dist.sparc
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.sparc,v
retrieving revision 1.1
diff -p -u -r1.1 NetBSD.dist.sparc
--- NetBSD.dist.sparc	17 Feb 2019 05:29:08 -0000	1.1
+++ NetBSD.dist.sparc	12 Mar 2019 05:13:42 -0000
@@ -1,4 +1,3 @@
 #	$NetBSD: NetBSD.dist.sparc,v 1.1 2019/02/17 05:29:08 mrg Exp $
 
-./usr/include/sparc
 ./usr/include/sparc64
Index: NetBSD.dist.sparc64
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.sparc64,v
retrieving revision 1.12
diff -p -u -r1.12 NetBSD.dist.sparc64
--- NetBSD.dist.sparc64	17 Feb 2019 05:29:08 -0000	1.12
+++ NetBSD.dist.sparc64	12 Mar 2019 05:13:42 -0000
@@ -1,4 +1,3 @@
 #	$NetBSD: NetBSD.dist.sparc64,v 1.12 2019/02/17 05:29:08 mrg Exp $
 
-./usr/include/sparc
 ./usr/include/sparc64
Index: NetBSD.dist.x86_64
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.x86_64,v
retrieving revision 1.13
diff -p -u -r1.13 NetBSD.dist.x86_64
--- NetBSD.dist.x86_64	9 Feb 2019 21:43:23 -0000	1.13
+++ NetBSD.dist.x86_64	12 Mar 2019 05:13:42 -0000
@@ -1,6 +1,5 @@
 #	$NetBSD: NetBSD.dist.x86_64,v 1.13 2019/02/09 21:43:23 mrg Exp $
 
-./usr/include/amd64
 ./usr/include/dev/nvmm
 ./usr/include/dev/nvmm/x86
 ./usr/include/i386