pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Define PKGPATH earlier so that mk.conf can use it.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/63493995f359
branches:  trunk
changeset: 531513:63493995f359
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Aug 01 12:21:56 2007 +0000

description:
Define PKGPATH earlier so that mk.conf can use it.
Requested by David Brownlee on tech-pkg.

diffstat:

 mk/bsd.prefs.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r cf9c4e7f6c2f -r 63493995f359 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed Aug 01 12:08:22 2007 +0000
+++ b/mk/bsd.prefs.mk   Wed Aug 01 12:21:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.258 2007/07/30 14:10:36 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.259 2007/08/01 12:21:56 joerg Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -251,6 +251,9 @@
 OBJECT_FMT?=           Mach-O
 .endif
 
+# Provide PKGPATH early on so that mk.conf can use it.
+PKGPATH?=              ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
+
 # Load the settings from MAKECONF, which is /etc/mk.conf by default.
 .include <bsd.own.mk>
 
@@ -518,7 +521,6 @@
 
 .include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
 
-PKGPATH?=              ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
 .if !defined(_PKGSRCDIR)
 _PKGSRCDIR!=           cd ${_PKGSRC_TOPDIR} && ${PWD_CMD}
 MAKEFLAGS+=            _PKGSRCDIR=${_PKGSRCDIR:Q}



Home | Main Index | Thread Index | Old Index