diff options
| author |   tb <tb@openbsd.org> | 2017-01-23 23:54:01 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2017-01-23 23:54:01 +0000 |
| commit | 04b3590026670e0f1f485c5492d2e766b51f14b0 (patch) | |
| tree | c19973450e8cd43cc92394033b77bd7bc049ffd8 | |
| parent | File descriptor passing internalizes fd's into an mbuf-stored array of (diff) | |
| download | wireguard-openbsd-04b3590026670e0f1f485c5492d2e766b51f14b0.tar.xz wireguard-openbsd-04b3590026670e0f1f485c5492d2e766b51f14b0.zip | |
Interpolate a 'make cleandir' if KEEPKERNELS is set to a non-empty string,
right before building kernels. This should unbreak 'make release' for
people having this setting.
ok deraadt
| -rw-r--r-- | etc/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index 63d4cfe9e04..a948ac265ce 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile,v 1.446 2016/11/20 11:00:19 tb Exp $ +# $OpenBSD: Makefile,v 1.447 2017/01/23 23:54:01 tb Exp $ + +.include <bsd.own.mk> TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -15,8 +17,9 @@ KERNELS = GENERIC bsd .for CONF K in ${KERNELS} . if !target($K) $K: - cd ../sys/arch/${MACHINE}/compile/${CONF} && ${MAKE} config && \ - ${MAKE} clean && exec ${MAKE} + cd ../sys/arch/${MACHINE}/compile/${CONF} && \ + { [[ -n "${KEEPKERNELS}" ]] || ${MAKE} cleandir; } && \ + ${MAKE} config && ${MAKE} clean && exec ${MAKE}; . endif ALL_KERNELS += $K .endfor @@ -238,7 +241,6 @@ release: @echo setenv RELEASEDIR before building a release. @false .else - release: umask ${WOBJUMASK}; exec ${MAKE} do-release |