diff options
| author |   espie <espie@openbsd.org> | 2005-02-05 10:39:50 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2005-02-05 10:39:50 +0000 |
| commit | 1466cb1b42f2dc6cf559e68ab03c1f2854ab0e3d (patch) | |
| tree | 6d9db98faf50108f986b0f420270c4125012b28d | |
| parent | no RTL8201L PHY's here.. (diff) | |
| download | wireguard-openbsd-1466cb1b42f2dc6cf559e68ab03c1f2854ab0e3d.tar.xz wireguard-openbsd-1466cb1b42f2dc6cf559e68ab03c1f2854ab0e3d.zip | |
introduce explicit MAKE_FLAGS variable, which has no surprising behavior
dependent on make, and fixes the regress problem reported by David Krause.
| -rw-r--r-- | regress/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/regress/Makefile b/regress/Makefile index 7813b984403..6506a6f548e 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2004/07/20 06:25:40 david Exp $ +# $OpenBSD: Makefile,v 1.19 2005/02/05 10:39:50 espie Exp $ # # To run full regression tests you just need two steps: @@ -31,7 +31,7 @@ _REGRESS_CLEAN=exit 0 .else _REGRESS_CLEAN=rm -f ${_REGRESS_TMP} .endif -.MAKEFLAGS+= _REGRESS_TMP=${_REGRESS_TMP} +MAKE_FLAGS+= _REGRESS_TMP=${_REGRESS_TMP} .INTERRUPT: ${_REGRESS_CLEAN} diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 7696c1a1b7a..0420ac3dec7 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.subdir.mk,v 1.13 2005/01/19 18:01:51 espie Exp $ +# $OpenBSD: bsd.subdir.mk,v 1.14 2005/02/05 10:39:50 espie Exp $ # $NetBSD: bsd.subdir.mk,v 1.11 1996/04/04 02:05:06 jtc Exp $ # @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 @@ -42,6 +42,7 @@ _SUBDIRUSE: .USE cd ${.CURDIR}/$${_newdir_}; \ ${MAKE} SKIPDIR="$${subskipdir}" \ $${_makefile_spec_} _THISDIR_="$${_nextdir_}" \ + ${MAKE_FLAGS} \ ${.TARGET:S/realinstall/install/:S/.depend/depend/}; \ fi); \ done @@ -58,7 +59,7 @@ ${SUBDIR}:: fi; \ echo "===> $${_newdir_}"; \ cd ${.CURDIR}/$${_newdir_}; \ - ${MAKE} $${_makefile_spec_} _THISDIR_="$${_newdir_}" all + ${MAKE} ${MAKE_FLAGS} $${_makefile_spec_} _THISDIR_="$${_newdir_}" all .endif .if !target(install) |