summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2016-10-06 16:22:44 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2016-10-06 16:22:44 +0000
commitd690d085048eb7d9e73e77cd86a4869ec7c25810 (patch)
treeb993ed6ca58d946e745a88f8fb031832f0cd078e /Makefile
parenta7de81245dac1153181b3c910384914076713599 (diff)
Simplify the 'make includes' step in 'make build': move the privdrop
bit up into 'make includes', so the latter benefits from that idiom as well. Sprinkle a few 'exec' while there. ok natano
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 42883133a9b..9b08f0b92ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.127 2016/10/05 18:00:41 natano Exp $
+# $OpenBSD: Makefile,v 1.128 2016/10/06 16:22:43 tb Exp $
#
# For more information on building in tricky environments, please see
@@ -50,7 +50,9 @@ regression-tests:
@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
@@ -77,10 +79,8 @@ build:
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} includes
+ exec ${MAKE} cleandir
cd ${.CURDIR}/lib && \
su ${BUILDUSER} -c '${MAKE} depend && exec ${MAKE}' && \
NOMAN=1 exec ${MAKE} install