===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.127
retrieving revision 1.134
diff -u -r1.127 -r1.134
--- src/Makefile	2016/10/05 18:00:41	1.127
+++ src/Makefile	2017/07/05 10:22:32	1.134
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.127 2016/10/05 18:00:41 natano Exp $
+#	$OpenBSD: Makefile,v 1.134 2017/07/05 10:22:32 espie Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -50,7 +50,9 @@
 	@cd ${.CURDIR}/regress && ${MAKE} depend && exec ${MAKE} regress
 
 includes:
-	cd ${.CURDIR}/include && ${MAKE} prereq && exec ${MAKE} includes
+	cd ${.CURDIR}/include && \
+		su ${BUILDUSER} -c 'exec ${MAKE} prereq' && \
+		exec ${MAKE} includes
 
 beforeinstall:
 	cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
@@ -69,25 +71,27 @@
 	@false
 .else
 build:
+	umask ${WOBJUMASK}; exec ${MAKE} do-build
+
+do-build:
 .ifdef GLOBAL_AUTOCONF_CACHE
-	cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
+	${INSTALL} -c -o ${BUILDUSER} -g ${WOBJGROUP} -m 664 /dev/null \
+	    ${GLOBAL_AUTOCONF_CACHE}
 .endif
 	@if [[ `id -u` -ne 0 ]]; then \
-		echo 'must be called by root' 2>&1; \
+		echo $@ must be called by root >&2; \
 		false; \
 	fi
 	cd ${.CURDIR}/share/mk && exec ${MAKE} install
-	cd ${.CURDIR}/include && \
-	    su ${BUILDUSER} -c 'exec ${MAKE} prereq' && \
-	    exec ${MAKE} includes
-	${MAKE} cleandir
+	exec ${MAKE} cleandir
+	exec ${MAKE} includes
 	cd ${.CURDIR}/lib && \
-	    su ${BUILDUSER} -c '${MAKE} depend && exec ${MAKE}' && \
+	    su ${BUILDUSER} -c 'exec ${MAKE}' && \
 	    NOMAN=1 exec ${MAKE} install
 	cd ${.CURDIR}/gnu/lib && \
-	    su ${BUILDUSER} -c '${MAKE} depend && exec ${MAKE}' && \
+	    su ${BUILDUSER} -c 'exec ${MAKE}' && \
 	    NOMAN=1 exec ${MAKE} install
-	su ${BUILDUSER} -c '${MAKE} depend && exec ${MAKE}' && \
+	su ${BUILDUSER} -c 'exec ${MAKE}' && \
 	    exec ${MAKE} install
 	/bin/sh ${.CURDIR}/distrib/sets/makeetcset ${.CURDIR} ${MAKE}
 .endif
@@ -105,6 +109,6 @@
 
 .PHONY: ${CROSS_TARGETS} \
 	build regression-tests includes beforeinstall afterinstall \
-	all depend
+	all depend do-build
 
 .include <bsd.subdir.mk>