summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-08-31 11:04:58 +0000
committerjlam <jlam@pkgsrc.org>2003-08-31 11:04:58 +0000
commitfe1d66ea296f081927f76bd1aea06953b4cde4d8 (patch)
tree7193442122e6e379707727a2da10dc033b349a10 /mk
parent09d275fa13c2b5e68603bdd18ba0e37cf4f22a0a (diff)
downloadpkgsrc-fe1d66ea296f081927f76bd1aea06953b4cde4d8.tar.gz
Create new variables PKG_*_CMD that contain just the paths to the various
pkg_install tools.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk20
1 files changed, 13 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index d755a470d13..ed8c2a357f6 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.120 2003/08/21 16:16:46 gavan Exp $
+# $NetBSD: bsd.prefs.mk,v 1.121 2003/08/31 11:04:58 jlam Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -276,12 +276,18 @@ DIGEST_VERSION!= ${DIGEST} -V 2>/dev/null
MAKEFLAGS+= DIGEST_VERSION="${DIGEST_VERSION}"
.endif
-PKG_DBDIR?= ${DESTDIR}/var/db/pkg
-PKG_ADD?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_add
-PKG_ADMIN?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_admin
-PKG_CREATE?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_create
-PKG_DELETE?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_delete
-PKG_INFO?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_info
+PKG_ADD_CMD?= ${PKG_TOOLS_BIN}/pkg_add
+PKG_ADMIN_CMD?= ${PKG_TOOLS_BIN}/pkg_admin
+PKG_CREATE_CMD?= ${PKG_TOOLS_BIN}/pkg_create
+PKG_DELETE_CMD?= ${PKG_TOOLS_BIN}/pkg_delete
+PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_info
+
+PKG_DBDIR?= ${DESTDIR}/var/db/pkg
+PKG_ADD?= PKG_DBDIR=${PKG_DBDIR} ${PKG_ADD_CMD}
+PKG_ADMIN?= PKG_DBDIR=${PKG_DBDIR} ${PKG_ADMIN_CMD}
+PKG_CREATE?= PKG_DBDIR=${PKG_DBDIR} ${PKG_CREATE_CMD}
+PKG_DELETE?= PKG_DBDIR=${PKG_DBDIR} ${PKG_DELETE_CMD}
+PKG_INFO?= PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD}
.ifndef PKGTOOLS_VERSION
PKGTOOLS_VERSION!= ${PKG_INFO} -V 2>/dev/null || echo 20010302