diff options
| author | kim <kim@pkgsrc.org> | 2000-04-24 03:40:50 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2000-04-24 03:40:50 +0000 |
| commit | 8520b168caae4e9663f76119bd3f5db397590ab0 (patch) | |
| tree | 1b651f256d35add43a9d2ff7d18aac1edf173a32 /mk | |
| parent | fbb501ead482f44c35bbcadf6e4a00dba938989a (diff) | |
| download | pkgsrc-8520b168caae4e9663f76119bd3f5db397590ab0.tar.gz | |
Set DEPENDS_TARGET=package during a "make package", and propagate
DEPENDS_TARGET to builds for dependencies.
This results in "make package" creating packages for all missing
dependencies as well, instead of merely installing them on the system.
This is a more consistent and intuitive behaviour.
Running "make install" will install the dependencies just like before
(no binary packages will be built).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 29794d0acff..4a0b70f59e3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -i $NetBSD: bsd.pkg.mk,v 1.425 2000/04/19 15:02:31 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.426 2000/04/24 03:40:50 kim Exp $ # # This file is in the public domain. # @@ -937,6 +937,8 @@ all: build .if !defined(DEPENDS_TARGET) .if make(reinstall) DEPENDS_TARGET= reinstall +.elif make(package) +DEPENDS_TARGET= package .else DEPENDS_TARGET= install .endif @@ -1352,7 +1354,7 @@ PLIST_SRC= _PORT_USE: .USE .if make(real-extract) - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} build-depends misc-depends + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} build-depends misc-depends DEPENDS_TARGET=${DEPENDS_TARGET} .endif ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${.TARGET:S/^real-/pre-/} ${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/} ]; then \ @@ -1619,7 +1621,7 @@ package: uptodate-pkgtools install ${PACKAGE_COOKIE} .endif ${EXTRACT_COOKIE}: - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} real-extract + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} real-extract DEPENDS_TARGET=${DEPENDS_TARGET} ${PATCH_COOKIE}: ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} real-patch ${CONFIGURE_COOKIE}: @@ -2170,7 +2172,7 @@ package-depends: if ${PACKAGE_DEPENDS_QUICK} ; then \ ${PKG_INFO} -qf "$$pkg" | grep ^@pkgdep | awk '{print $$2}' ; \ else \ - (cd $$dir && ${MAKE} package-depends PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \ + (cd $$dir && ${MAKE} package-depends PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \ fi ; \ else \ ${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \ @@ -2248,7 +2250,7 @@ _DEPENDS_USE: if [ ! -d "$$dir" ]; then \ ${ECHO_MSG} "=> No directory for $$prog. Skipping.."; \ else \ - (cd $$dir && ${MAKE} ${.MAKEFLAGS} $$target) && \ + (cd $$dir && ${MAKE} ${.MAKEFLAGS} $$target DEPENDS_TARGET=${DEPENDS_TARGET}) && \ ${ECHO_MSG} "${_PKGSRC_IN}> Returning to build of ${PKGNAME}"; \ fi; \ fi |