summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-04-27 19:23:34 +0000
committerjlam <jlam@pkgsrc.org>2004-04-27 19:23:34 +0000
commita7faf8acc5753e381e8fba915b1119a5fcafa819 (patch)
treef02b3310af3ee578b1d35873cd87d3dd4009a050 /mk
parent94da92332c9a78ff8a9a097db525a48c3697137d (diff)
downloadpkgsrc-a7faf8acc5753e381e8fba915b1119a5fcafa819.tar.gz
Move the inclusion of tools.mk ahead of bsd.buildlink3.mk so that tools.mk
can include buildlink3.mk files. This change also causes work/.tools/bin to appear after work/.buildlink/bin in the PATH, but we never relied on this behaviour, so this side-effect should have no impact.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 0ef6bf54350..d8dfe4ed41a 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1452 2004/04/26 05:13:06 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1453 2004/04/27 19:23:34 jlam Exp $
#
# This file is in the public domain.
#
@@ -1378,6 +1378,8 @@ USE_LANGUAGES?= # empty
#
.include "../../mk/compiler.mk"
+.include "../../mk/tools.mk"
+
.if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO])
NO_BUILDLINK= # defined
.endif
@@ -1389,8 +1391,6 @@ NO_BUILDLINK= # defined
. endif
.endif
-.include "../../mk/tools.mk"
-
.if defined(USE_DIRS) && !empty(USE_DIRS) && \
${PKG_INSTALLATION_TYPE} == "overwrite"
. include "../../mk/dirs.mk"