even cleaner mach/arch/machdir/archdir

27 files changed, 81 insertions, 84 deletions

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index ac7e0841261..830eb65ed72 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.50 2010/04/26 22:11:36 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.51 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		alpha
-_machdir?=	$S/arch/alpha
 _arch?=		alpha
-_archdir?=	$S/arch/alpha
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dalpha
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 4f958ee1f24..70dc3afe2b5 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.25 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.26 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		amd64
-_machdir?=	$S/arch/amd64
 _arch?=		amd64
-_archdir?=	$S/arch/amd64
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Damd64 -Dx86_64
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index d693e082a4b..77167e16cef 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.15 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.armish,v 1.16 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		armish
-_machdir?=	$S/arch/armish
 _arch?=		arm
-_archdir?=	$S/arch/arm
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index db9dfb27caa..b5592198680 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.aviion,v 1.13 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.aviion,v 1.14 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		aviion
-_machdir?=	$S/arch/aviion
 _arch?=		m88k
-_archdir?=	$S/arch/m88k
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Daviion -Dm88k
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 9424ed39310..fc219f49a6d 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.10 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.beagle,v 1.11 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		beagle
-_machdir?=	$S/arch/beagle
 _arch?=		arm
-_archdir?=	$S/arch/arm
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index ff94a74c14d..08126374778 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.gumstix,v 1.8 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.gumstix,v 1.9 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,12 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		gumstix
-_machdir?=	$S/arch/gumstix
 _arch?=		arm
-_archdir?=	$S/arch/arm
-
-_machdir=	$S/arch/gumstix
-ARM=	$S/arch/arm
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__gumstix__
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 63717fde06c..7c020a4a867 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.50 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.hp300,v 1.51 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		hp300
-_machdir?=	$S/arch/hp300
 _arch?=		m68k
-_archdir?=	$S/arch/m68k
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 06c27c430af..c833f84bb2b 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.40 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.41 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		hppa
-_machdir=	$S/arch/hppa
 _arch?=		hppa
-_archdir?=	$S/arch/hppa
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 1671c5f1122..1bf37614e5b 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.14 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.15 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		hppa64
-_machdir?=	$S/arch/hppa64
 _arch?=		hppa64
-_archdir?=	$S/arch/hppa64
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index aa900775a4d..8930d7f1026 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.57 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.58 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		i386
-_machdir?=	$S/arch/i386
 _arch?=		i386
-_archdir?=	$S/arch/i386
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D${_mach}
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 2d02f0197a6..aecf3df6768 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.15 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.16 2010/04/26 22:21:14 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -33,9 +33,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		landisk
-_machdir?=	$S/arch/landisk
 _arch?=		sh
-_archdir?=	$S/arch/sh
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dlandisk
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 2dd8372f60d..d911d24e962 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.6 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.7 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config ``machineid''
@@ -41,9 +41,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		loongson
-_machdir?=	$S/arch/loongson
 _arch?=		mips64
-_archdir?=	$S/arch/mips64
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 61ce900f6bc..2c125d00414 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.19 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.20 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		luna88k
-_machdir?=	$S/arch/luna88k
 _arch?=		m88k
-_archdir?=	$S/arch/m88k
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dluna88k -Dm88k
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 2e2fd58fb3b..9a3a6f1813d 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.47 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.48 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		mac68k
-_machdir?=	$S/arch/mac68k
 _arch?=		m68k
-_archdir?=	$S/arch/m68k
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 0ac2947965a..b0753dec569 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.36 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.37 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -33,9 +33,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		macppc
-_machdir?=	$S/arch/macppc
 _arch?=		powerpc
-_archdir?=	$S/arch/powerpc
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL \
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index ff6cc74f7b0..f2bac46409a 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.moko,v 1.8 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.moko,v 1.9 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		moko
-_machdir?=	$S/arch/moko
 _arch?=		arm
-_archdir?=	$S/arch/arm
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 0e0fe807cac..c27286928a1 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.39 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.40 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		mvme68k
-_machdir?=	$S/arch/mvme68k
 _arch?=		m68k
-_archdir?=	$S/arch/m68k
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	 -I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index d9df1bb6c73..79438bfbf82 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme88k,v 1.50 2010/04/26 22:11:37 deraadt Exp $
+#	$OpenBSD: Makefile.mvme88k,v 1.51 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		mvme88k
-_machdir?=	$S/arch/mvme88k
 _arch?=		m88k
-_archdir?=	$S/arch/m88k
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmvme88k -Dm88k
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index 6078ace0cc8..1549ea74020 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvmeppc,v 1.34 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.mvmeppc,v 1.35 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -34,9 +34,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		mvmeppc
-_machdir?=	$S/arch/mvmeppc
 _arch?=		powerpc
-_archdir?=	$S/arch/powerpc
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL \
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index fbb707022e1..d443e22f078 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.palm,v 1.5 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.palm,v 1.6 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		palm
-_machdir?=	$S/arch/palm
 _arch?=		arm
-_archdir?=	$S/arch/arm
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 82e2595a2e1..d317cf190f1 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.29 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.30 2010/04/26 22:21:15 deraadt Exp $
 
 # Makefile for OpenBSD
 #
@@ -43,9 +43,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		sgi
-_machdir?=	$S/arch/sgi
 _arch?=		mips64
-_archdir?=	$S/arch/mips64
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index cab7d984225..bea6ea1568f 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.8 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.socppc,v 1.9 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -34,9 +34,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		socppc
-_machdir?=	$S/arch/socppc
 _arch?=		powerpc
-_archdir?=	$S/arch/powerpc
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL \
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index b14a9b52998..42c037a8908 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.solbourne,v 1.15 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.solbourne,v 1.16 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		solbourne
-_machdir?=	$S/arch/solbourne
 _arch?=		solbourne
-_archdir?=	$S/arch/solbourne
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dsparc -Dsolbourne
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 1409c9cf13b..be89c056b2b 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc,v 1.51 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.sparc,v 1.52 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		sparc
-_machdir?=	$S/arch/sparc
 _arch?=		sparc
-_archdir?=	$S/arch/sparc
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dsparc
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index c90aa966334..774cbefeb4d 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.37 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.38 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		sparc64
-_machdir?=	$S/arch/sparc64
 _arch?=		sparc64
-_archdir?=	$S/arch/sparc64
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index bf12192f4fc..66a6d75c4f8 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.38 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.vax,v 1.39 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -59,9 +59,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		vax
-_machdir?=	$S/arch/vax
 _arch?=		vax
-_archdir?=	$S/arch/vax
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-I. -I$S -I$S/arch -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 0273cdcfc1e..6ff497d19a3 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.18 2010/04/26 22:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.19 2010/04/26 22:21:15 deraadt Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -31,9 +31,9 @@ S!=	cd ../../../..; pwd
 .endif
 
 _mach?=		zaurus
-_machdir?=	$S/arch/zaurus
 _arch?=		arm
-_archdir?=	$S/arch/arm
+_machdir?=	$S/arch/${_mach}
+_archdir?=	$S/arch/${_arch}
 
 INCLUDES=	-nostdinc -I. -I$S -I$S/arch
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__