Browse Source

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
OPENBSD_6_1
tb 7 years ago
parent
commit
b4d68e99ba
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      src/etc/Makefile

+ 6
- 4
src/etc/Makefile View File

@ -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 TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -15,8 +17,9 @@ KERNELS = GENERIC bsd
.for CONF K in ${KERNELS} .for CONF K in ${KERNELS}
. if !target($K) . if !target($K)
$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 . endif
ALL_KERNELS += $K ALL_KERNELS += $K
.endfor .endfor
@ -238,7 +241,6 @@ release:
@echo setenv RELEASEDIR before building a release. @echo setenv RELEASEDIR before building a release.
@false @false
.else .else
release: release:
umask ${WOBJUMASK}; exec ${MAKE} do-release umask ${WOBJUMASK}; exec ${MAKE} do-release


Loading…
Cancel
Save