pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Move the inclusion of tools.mk ahead of bsd.buildli...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e8b8c29be7b
branches:  trunk
changeset: 474337:8e8b8c29be7b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 27 19:23:34 2004 +0000

description:
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:

 mk/bsd.pkg.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8527081504a2 -r 8e8b8c29be7b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Apr 27 19:08:36 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Apr 27 19:23:34 2004 +0000
@@ -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 @@
 #
 .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 @@
 .  endif
 .endif
 
-.include "../../mk/tools.mk"
-
 .if defined(USE_DIRS) && !empty(USE_DIRS) && \
     ${PKG_INSTALLATION_TYPE} == "overwrite"
 .  include "../../mk/dirs.mk"



Home | Main Index | Thread Index | Old Index