[pkgsrc/trunk]: pkgsrc/mk/tools The mk/tools/defaults.mk is included by bsd.p...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aef765bd6284
branches:  trunk
changeset: 493775:aef765bd6284
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat May 14 19:01:14 2005 +0000

description:
The mk/tools/defaults.mk is included by bsd.prefs.mk, so it must include
other files without making assumptions about the location of the top of
the pkgsrc tree.  This fixes problems with running "make bulk-cache"
in /usr/pkgsrc (PR pkg/30288).

diffstat:

 mk/tools/defaults.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r 66ee63cca884 -r aef765bd6284 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Sat May 14 17:19:02 2005 +0000
+++ b/mk/tools/defaults.mk      Sat May 14 19:01:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.11 2005/05/13 22:08:20 jlam Exp $
+# $NetBSD: defaults.mk,v 1.12 2005/05/14 19:01:14 jlam Exp $
 
 .if !defined(TOOLS_DEFAULTS_MK)
 TOOLS_DEFAULTS_MK=     defined
@@ -8,9 +8,9 @@
 # XXX These should eventually just migrate over to the appropriate
 # XXX pkgsrc/mk/platform/${OPSYS}.mk file.
 #
-.include "../../mk/tools/bootstrap.mk"
-.if exists(../../mk/tools/tools.${OPSYS}.mk)
-.  include "../../mk/tools/tools.${OPSYS}.mk"
+.include "${_PKGSRC_TOPDIR}/mk/tools/bootstrap.mk"
+.if exists(${_PKGSRC_TOPDIR}/mk/tools/tools.${OPSYS}.mk)
+.  include "${_PKGSRC_TOPDIR}/mk/tools/tools.${OPSYS}.mk"
 .endif
 
 # "TOOL" variable names associated with each of the tools