diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-14 19:01:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-14 19:01:14 +0000 |
| commit | e69236654770543cf08586a986ffa1883a255508 (patch) | |
| tree | 9ec837313e20dfac087f6b6d818bd41fb94c6df6 | |
| parent | 42c87d0fd850477dfe7e22131728bf8119ab2728 (diff) | |
| download | pkgsrc-e69236654770543cf08586a986ffa1883a255508.tar.gz | |
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).
| -rw-r--r-- | mk/tools/defaults.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index 6e279348591..1872ac77fff 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -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 @@ TOOLS_DEFAULTS_MK= defined # 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 |