diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2005-02-05 10:39:51 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2005-02-05 10:39:51 +0000 |
commit | 10c3866d609f6334d62e981f8ec90b164dfcbf61 (patch) | |
tree | 46077a155c9feeef2d29992cd2bb1a0e8d89792e /share/mk/bsd.subdir.mk | |
parent | 0132b63b9cce52179f1b5d65924c9446d4426944 (diff) |
introduce explicit MAKE_FLAGS variable, which has no surprising behavior
dependent on make, and fixes the regress problem reported by David Krause.
Diffstat (limited to 'share/mk/bsd.subdir.mk')
-rw-r--r-- | share/mk/bsd.subdir.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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) |