diff options
| author | hubertf <hubertf> | 2002-04-25 21:58:55 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2002-04-25 21:58:55 +0000 |
| commit | 727832ec70b2174986423a560eda531a3e40f3b1 (patch) | |
| tree | 896b2ad1c9a142fd5820b227c2360b44446b245c /mk | |
| parent | 36efcfff0f774271561722cf2b9a220b0aa7e9e6 (diff) | |
| download | pkgsrc-727832ec70b2174986423a560eda531a3e40f3b1.tar.gz | |
bin-install: set DEPENDS_TARGET=bin-install, so depends are still
installed via binaries (if possible), even if there is no binary
pkg available for the current pkg.
Implementation still allows overriding DEPENDS_TARGET=build (etc.)
to force installation of dependencies by compiling if desired.
Patch submitted by Marko Schuetz <MarkoSchuetz@web.de> in private mail.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 52c2d8ef4f2..8041a96de9f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.968 2002/04/25 00:02:41 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.969 2002/04/25 21:58:55 hubertf Exp $ # # This file is in the public domain. # @@ -1127,6 +1127,8 @@ all: build DEPENDS_TARGET= package . elif make(update) DEPENDS_TARGET= update +. elif make(bin-install) +DEPENDS_TARGET= bin-install . else DEPENDS_TARGET= reinstall . endif @@ -3119,7 +3121,8 @@ bin-install: if ! ${PKG_INFO} -qe ${PKGNAME} ; then \ ${SHCOMMENT} Cycle through some FTP server here ;\ ${ECHO_MSG} "Installing from source" ; \ - ${MAKE} ${MAKEFLAGS} package && \ + ${MAKE} ${MAKEFLAGS} package \ + DEPENDS_TARGET=${DEPENDS_TARGET} && \ ${MAKE} ${MAKEFLAGS} clean ; \ fi ; \ fi |