Massively simplify this. Partly from David Holland in PR 3823.

share/mk/bsd.subdir.mk

@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.subdir.mk,v 1.24 1997/05/31 21:22:00 cjs Exp $
+#	$NetBSD: bsd.subdir.mk,v 1.25 1997/10/10 09:12:28 mycroft Exp $
 #	@(#)bsd.subdir.mk	8.1 (Berkeley) 6/8/93
 
 .include <bsd.own.mk>
@@ -7,34 +7,22 @@
 .MAIN: all
 .endif
 
-_SUBDIRUSE: .USE ${SUBDIR:S/^/${.TARGET}-/}
-
-__SUBDIRINTERNALUSE: .USE
-	@(_maketarget_="${.TARGET}"; \
-	entry="$${_maketarget_#*-}";\
-	target="$${_maketarget_%%-*}";\
-	set -e; if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
-		_newdir_="$${entry}.${MACHINE}"; \
-	else \
-		_newdir_="$${entry}"; \
-	fi; \
-	if test X"${_THISDIR_}" = X""; then \
-		_nextdir_="$${_newdir_}"; \
-	else \
-		_nextdir_="$${_THISDIR_}/$${_newdir_}"; \
-	fi; \
-	if test -d ${.CURDIR}/$${_newdir_}; then \
-		echo "===> $${_nextdir_}"; \
-		cd ${.CURDIR}/$${_newdir_}; \
-		${MAKE} _THISDIR_="$${_nextdir_}" $${target}; \
-	else \
-		echo "===> $${_nextdir_} [skipped: missing]"; \
-	fi)
-
 .for dir in ${SUBDIR}
+.if exists(${dir}.${MACHINE})
+__REALSUBDIR+=${dir}.${MACHINE}
+.else
+__REALSUBDIR+=${dir}
+.endif
+.endfor
+
+.for dir in ${__REALSUBDIR}
 .for targ in ${TARGETS}
 .PHONY: ${targ}-${dir}
-${targ}-${dir}: .MAKE __SUBDIRINTERNALUSE
+${targ}-${dir}: .MAKE
+	@echo "===> ${_THISDIR_}${dir}"
+	@cd ${.CURDIR}/${dir}; \
+	${MAKE} "_THISDIR_=${_THISDIR_}${dir}/" ${targ}
+${targ}: ${targ}-${dir}
 .endfor
 
 # Backward-compatibility with the old rules.  If this went away,
@@ -42,12 +30,4 @@ ${targ}-${dir}: .MAKE __SUBDIRINTERNALUSE
 ${dir}: all-${dir}
 .endfor
 
-.for targ in ${TARGETS}
-${targ}: _SUBDIRUSE
-.endfor
-
-.if defined(SUBDIR) && !empty(SUBDIR)
-realinstall: ${SUBDIR:S/^/install-/g}
-.endif
-
 .include <bsd.own.mk>