From 24cc9713cacc7783e27a27c849598c3e1e1b6753 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 27 Aug 2003 03:38:21 +0000 Subject: Rename BUILDLINK_DEPOT to BUILDLINK_PKG_DBDIR to more accurately reflect what we'll be using the variable for. --- mk/buildlink3/bsd.buildlink3.mk | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 8a36c3764c6..03ad3598fe5 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.20 2003/08/27 01:47:34 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.1.2.21 2003/08/27 03:38:21 jlam Exp $ # # An example package buildlink3.mk file: # @@ -90,37 +90,36 @@ ${_BLNK_DEPMETHOD.${_pkg_}}+= \ # Generate default values for: # # BUILDLINK_PKGBASE. -# BUILDLINK_DEPOT. +# BUILDLINK_PKG_DBDIR. # BUILDLINK_PREFIX. # BUILDLINK_INCDIRS. # BUILDLINK_LIBDIRS. # # BUILDLINK_PKGBASE. is the package basename (without the version -# number). BUILDLINK_DEPOT. is the depot directory for and -# contains all of the package metadata files for . -# BUILDLINK_PREFIX. is the directory that contains all of the installed -# files for . BUILDLINK_INCDIRS. and BUILDLINK_LIBDIRS. are -# the subdirectories of BUILDLINK_PREFIX. that should be added to the -# compiler/linker search paths. +# number). BUILDLINK_PKG_DBDIR. contains all of the package metadata +# files for . BUILDLINK_PREFIX. is the directory that contains +# all of the installed files for . BUILDLINK_INCDIRS. and +# BUILDLINK_LIBDIRS. are the subdirectories of BUILDLINK_PREFIX. +# that should be added to the compiler/linker search paths. # .for _pkg_ in ${BUILDLINK_PACKAGES} . if !defined(BUILDLINK_PKGBASE.${_pkg_}) BUILDLINK_PKGBASE.${_pkg_}?= ${_pkg_} . endif -. if !defined(BUILDLINK_DEPOT.${_pkg_}) -BUILDLINK_DEPOT.${_pkg_}!= \ +. if !defined(BUILDLINK_PKG_DBDIR.${_pkg_}) +BUILDLINK_PKG_DBDIR.${_pkg_}!= \ cd ${_PKG_DBDIR}; \ dir=`${PKG_ADMIN} -s "" lsbest "${BUILDLINK_DEPENDS.${_pkg_}}" || ${TRUE}`; \ case "$$dir" in \ "") dir="not_found" ;; \ esac; \ ${ECHO} $$dir -. if empty(BUILDLINK_DEPOT.${_pkg_}:Mnot_found) -MAKEFLAGS+= BUILDLINK_DEPOT.${_pkg_}=${BUILDLINK_DEPOT.${_pkg_}} +. if empty(BUILDLINK_PKG_DBDIR.${_pkg_}:Mnot_found) +MAKEFLAGS+= BUILDLINK_PKG_DBDIR.${_pkg_}=${BUILDLINK_PKG_DBDIR.${_pkg_}} . endif . endif . if !defined(BUILDLINK_PREFIX.${_pkg_}) -BUILDLINK_PREFIX.${_pkg_}?= ${BUILDLINK_DEPOT.${_pkg_}} +BUILDLINK_PREFIX.${_pkg_}?= ${BUILDLINK_PKG_DBDIR.${_pkg_}} . endif . if !defined(BUILDLINK_INCDIRS.${_pkg_}) BUILDLINK_INCDIRS.${_pkg_}?= include -- cgit v1.2.3