diff options
| author | jlam <jlam> | 2003-08-16 21:59:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-16 21:59:02 +0000 |
| commit | 025e8891b3ca16f4c88c683699ae7779782013b2 (patch) | |
| tree | 2f618b7ea2bac8ee2e0c7775d99c97b5121f3616 /mk/buildlink3 | |
| parent | d5b2aec5204340fd719f27a174d6dc1e2bb329f5 (diff) | |
| download | pkgsrc-025e8891b3ca16f4c88c683699ae7779782013b2.tar.gz | |
Use DEPOT_PKG_ADMIN instead of PKG_ADMIN_CMD (just for correctness since
we're assuming pkgviews here), and default the BUILDLINK_DEPOT.<pkg>
variable to be the default view directory if <pkg> isn't installed.
Diffstat (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 060964a75cf..82de78ef2be 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.1.2.7 2003/08/16 19:46:27 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.1.2.8 2003/08/16 21:59:02 jlam Exp $ # # Assume PKG_INSTALLATION_TYPE == "pkgviews". @@ -31,7 +31,7 @@ X11_LINKS_SUBDIR= share/x11-links BUILDLINK_X11_DIR!= \ if ${DEPOT_PKG_INFO} -qe "${BUILDLINK_DEPENDS.x11-links}"; then \ cd ${DEPOTBASE}; \ - ${PKG_ADMIN_CMD} -s "" lsbest "${BUILDLINK_DEPENDS.x11-links}"; \ + ${DEPOT_PKG_ADMIN} -s "" lsbest "${BUILDLINK_DEPENDS.x11-links}"; \ else \ ${ECHO} "${LOCALBASE}/${X11_LINKS_SUBDIR}"; \ fi @@ -81,8 +81,12 @@ BUILDLINK_PKGBASE.${_pkg_}?= ${_pkg_} . endif . if !defined(BUILDLINK_DEPOT.${_pkg_}) BUILDLINK_DEPOT.${_pkg_}!= \ - cd ${DEPOTBASE}; \ - ${PKG_ADMIN_CMD} -s "" lsbest "${BUILDLINK_DEPENDS.${_pkg_}}" + if ${DEPOT_PKG_INFO} -qe "${BUILDLINK_DEPENDS.${_pkg_}}"; then \ + cd ${DEPOTBASE}; \ + ${DEPOT_PKG_ADMIN} -s "" lsbest "${BUILDLINK_DEPENDS.${_pkg_}}"; \ + else \ + ${ECHO} "${LOCALBASE}"; \ + fi . endif . if !defined(BUILDLINK_INCDIRS.${_pkg_}) BUILDLINK_INCDIRS.${_pkg_}?= include |