diff options
| author | hubertf <hubertf> | 2000-08-01 02:23:43 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-08-01 02:23:43 +0000 |
| commit | 74217cb1fb3fe80e13b02697f25dbdcbfac318c0 (patch) | |
| tree | d098f5baa9cef20fb0e46822188197f126dbf0f1 /mk | |
| parent | 98b88380ab9d1bdbc4c8eb8b12a24d5bdefebc9d (diff) | |
| download | pkgsrc-74217cb1fb3fe80e13b02697f25dbdcbfac318c0.tar.gz | |
Some more target renaming:
depends => install-depends
run-depends => install-run-depends
build-depends => install-build-depends
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a6ef8fa7ef7..c0d0c8d3429 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.530 2000/08/01 02:18:12 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.531 2000/08/01 02:23:43 hubertf Exp $ # # This file is in the public domain. # @@ -187,7 +187,7 @@ DEPENDS+= gtexinfo-3.12:../../devel/gtexinfo LIBTOOL= ${LOCALBASE}/bin/libtool # XXX: actually, here we would need something like # BUILD_DEPENDS+=libtool>1.3.5nb3:../../devel/libtool -.if make(run-depends) +.if make(install-run-depends) DEPENDS+= libtool>1.3.5nb3:../../devel/libtool .endif .elif defined(USE_PKGLIBTOOL) @@ -1504,7 +1504,7 @@ PLIST_SRC= _PORT_USE: .USE .if make(real-extract) - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} build-depends run-depends DEPENDS_TARGET=${DEPENDS_TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} install-build-depends install-run-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 \ @@ -2466,9 +2466,9 @@ package-noinstall: ################################################################ .if !target(depends) -depends: run-depends build-depends +install-depends: install-run-depends install-build-depends -build-depends: +install-build-depends: .if defined(BUILD_DEPENDS) .if !defined(NO_DEPENDS) .for dep in ${BUILD_DEPENDS} @@ -2519,7 +2519,7 @@ build-depends: FATAL_OBJECT_FMT_SKEW?= yes WARN_NO_OBJECT_FMT?= yes -run-depends: uptodate-pkgtools +install-run-depends: uptodate-pkgtools .if defined(DEPENDS) .if !defined(NO_DEPENDS) .for dep in ${DEPENDS} @@ -2575,7 +2575,7 @@ check-depends: !defined(NO_DEPENDS) && !defined(NO_CHECK_DEPENDS) && !exists(${EXTRACT_COOKIE}) ${_PKG_SILENT}${_PKG_DEBUG}\ ${ECHO_MSG} "${_PKGSRC_IN}> Validating dependencies for ${PKGNAME}" ; \ - ${MAKE} ${MAKEFLAGS} DEPENDS_TARGET=check-depends ECHO_MSG=${TRUE:Q} IGNORE_FAIL=1 _DEPENDS_TARGET_OVERRIDE=1 depends || \ + ${MAKE} ${MAKEFLAGS} DEPENDS_TARGET=check-depends ECHO_MSG=${TRUE:Q} IGNORE_FAIL=1 _DEPENDS_TARGET_OVERRIDE=1 install-depends || \ (${ECHO_MSG} "${_PKGSRC_IN}> ${PKGNAME} cannot build necessary dependencies."; ${FALSE}) .endif .endif |