diff options
| author |   tb <tb@openbsd.org> | 2016-10-06 16:22:43 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2016-10-06 16:22:43 +0000 |
| commit | 192f59d447bf8644ae9f60419fa6caeb3a436b33 (patch) | |
| tree | a01829c3a9834778e6a3737123de20f839c47a1e | |
| parent | Add support for RFC 6842. RFC 2131 said the server MUST NOT echo (diff) | |
| download | wireguard-openbsd-192f59d447bf8644ae9f60419fa6caeb3a436b33.tar.xz wireguard-openbsd-192f59d447bf8644ae9f60419fa6caeb3a436b33.zip | |
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
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 |