convert from (cd ${foo} && ${MAKE} bar) to ${MAKEDIRTARGET} foo bar

x11/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2004/02/23 05:47:47 rtr Exp $
+#	$NetBSD: Makefile,v 1.11 2004/04/13 12:50:34 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -28,27 +28,28 @@ START_TIME!=	date
 build: check_X11SRCDIR
 	@echo "X11 build started at: ${START_TIME}"
 .for tgt in ${BUILDTARGETS}
-	@(cd ${.CURDIR} && ${MAKE} ${tgt})
+	${MAKEDIRTARGET} . ${tgt}
 .endfor
 	@echo   "X11 build started at:  ${START_TIME}"
 	@printf "X11 build finished at: " && date
 
 do-build:
 .for targ in dependall install
-	(cd ${.CURDIR} && ${MAKE} ${targ})
+	${MAKEDIRTARGET} . ${targ}
 .endfor
 
 .for dir in	tools lib/X11 lib/ICE lib/Xau lib/SM lib/Xext lib/Xt lib/Xpm \
 		lib/Xrender lib/GL lib/Xmu lib/dps lib/expat lib
 do-${dir:S/\//-/g}:
 .  for targ in dependall install
-	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
+	${MAKEDIRTARGET} ${dir} ${targ}
 .  endfor
 .endfor
 
 afterinstall: .PHONY
 .if ${MKMAN} != "no"
-	(cd ${NETBSDSRCDIR}/share/man && ${MAKE} WHATISDBDIR=${X11MANDIR} makedb)
+	${MAKEDIRTARGET} ${NETBSDSRCDIR}/share/man makedb \
+	    WHATISDBDIR=${X11MANDIR}
 .endif