diff options
| author | minskim <minskim@pkgsrc.org> | 2005-04-05 03:18:00 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2005-04-05 03:18:00 +0000 |
| commit | aa94bc412afb9e301d4363571ac58cafe66fb27e (patch) | |
| tree | 4e3cbd97ba5b41ce1fe10d820c8e05aaa46c24b2 /mk | |
| parent | 9064085309a11d2428d58d7307f40727c1fca031 (diff) | |
| download | pkgsrc-aa94bc412afb9e301d4363571ac58cafe66fb27e.tar.gz | |
Prevent MAKEFLAGS from being passed through shell environment. It was
redundant because we explicitly pass MAKEFLAGS to a sub-process
through command line arguments.
This fixes the problem reported in PR pkg/29874 that PKGNAME_REQD is
not overridden in recursive MAKE calls.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1decf07fab5..d04db8e1565 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1606 2005/03/31 21:02:28 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1607 2005/04/05 03:18:00 minskim Exp $ # # This file is in the public domain. # @@ -4029,7 +4029,7 @@ install-depends: pre-install-depends ${ECHO_MSG} "=> No directory for $$dir. Skipping.."; \ else \ cd $$dir ; \ - ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" ${MAKE} ${MAKEFLAGS} $$target PKGNAME_REQD=\'$$pkg\' || exit 1; \ + ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" ${MAKE} ${MAKEFLAGS} $$target PKGNAME_REQD=\'$$pkg\' MAKEFLAGS="" || exit 1; \ ${ECHO_MSG} "${_PKGSRC_IN}> Returning to build of ${PKGNAME}"; \ fi; \ fi |