diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-24 21:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-24 21:54:49 +0000 |
| commit | 4a7c8310c5ad73f7407af63e1a1c3b44ffd54216 (patch) | |
| tree | ffc363e4713464f52f394260981796a994a18a92 /mk | |
| parent | 8a24c57277b8b8b4cacc782307bce7cb59311127 (diff) | |
| download | pkgsrc-4a7c8310c5ad73f7407af63e1a1c3b44ffd54216.tar.gz | |
Move pkgtools-related definitions into bsd.prefs.mk so that they may be
used by buildink2.mk files.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 13 |
2 files changed, 11 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c8f17113162..33ea0ca70cc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1054 2002/09/24 13:01:02 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1055 2002/09/24 21:54:49 jlam Exp $ # # This file is in the public domain. # @@ -641,12 +641,6 @@ MESSAGE_SUBST+= PKGNAME=${PKGNAME} \ MESSAGE_SUBST_SED= ${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/} .endif -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 - # Latest version of digest(1) required for pkgsrc DIGEST_REQD= 20010302 @@ -739,8 +733,6 @@ PKG_ARGS_BINPKG= -p ${PREFIX:S/^${DESTDIR}//} -L ${PREFIX} ${PKG_ARGS_COMMON} PKG_SUFX?= .tgz #PKG_SUFX?= .tbz # bzip2(1) pkgs -# where pkg_add records its dirty deeds. -PKG_DBDIR?= ${DESTDIR}/var/db/pkg # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree # of dependencies for building, and the current target. diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c8cd89ac8b9..5b2984103ae 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.78 2002/09/24 13:59:34 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.79 2002/09/24 21:54:51 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -321,9 +321,16 @@ 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 + .ifndef PKGTOOLS_VERSION -PKGTOOLS_VERSION!=${PKG_TOOLS_BIN}/pkg_info -V 2>/dev/null || echo 20010302 -MAKEFLAGS+= PKGTOOLS_VERSION="${PKGTOOLS_VERSION}" +PKGTOOLS_VERSION!= ${PKG_INFO} -V 2>/dev/null || echo 20010302 +MAKEFLAGS+= PKGTOOLS_VERSION="${PKGTOOLS_VERSION}" .endif .if (${OPSYS} == SunOS) && !defined(ZOULARIS_VERSION) |