[pkgsrc/trunk]: pkgsrc/mk Climb up the directory tree to find the top, instea...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a054e25d902a
branches:  trunk
changeset: 481541:a054e25d902a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Oct 06 20:59:40 2004 +0000

description:
Climb up the directory tree to find the top, instead of guessing where
the top and searching on the way down.  Thanks Gavan!

diffstat:

 mk/bsd.prefs.mk     |  10 +++++-----
 mk/defaults/mk.conf |  12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (51 lines):

diff -r 397c1c5d39ba -r a054e25d902a mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed Oct 06 20:51:47 2004 +0000
+++ b/mk/bsd.prefs.mk   Wed Oct 06 20:59:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.169 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.170 2004/10/06 20:59:40 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -213,12 +213,12 @@
 .endif
 
 # Calculate depth
-.if exists(${.CURDIR}/../../mk/bsd.pkg.mk)
-PKGSRC_TOPDIR= ${.CURDIR}/../..
+.if exists(${.CURDIR}/mk/bsd.pkg.mk)
+PKGSRC_TOPDIR= ${.CURDIR}
 .elif exists(${.CURDIR}/../mk/bsd.pkg.mk)
 PKGSRC_TOPDIR= ${.CURDIR}/..
-.elif exists(${.CURDIR}/mk/bsd.pkg.mk)
-PKGSRC_TOPDIR= ${.CURDIR}
+.elif exists(${.CURDIR}/../../mk/bsd.pkg.mk)
+PKGSRC_TOPDIR= ${.CURDIR}/../..
 .endif
 
 # include the defaults file
diff -r 397c1c5d39ba -r a054e25d902a mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Wed Oct 06 20:51:47 2004 +0000
+++ b/mk/defaults/mk.conf       Wed Oct 06 20:59:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: mk.conf,v 1.2 2004/10/06 20:59:40 jlam Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -2335,10 +2335,10 @@
 #MASTER_SITE_LOCAL=    \
 #      ftp://ftp.fr.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
-.if exists(${.CURDIR}/../../mk/defaults/obsolete.mk)
-.include "${.CURDIR}/../../mk/defaults/obsolete.mk"
+.if exists(${.CURDIR}/mk/defaults/obsolete.mk)
+.  include "${.CURDIR}/mk/defaults/obsolete.mk"
 .elif exists(${.CURDIR}/../mk/defaults/obsolete.mk)
-.include "${.CURDIR}/../mk/defaults/obsolete.mk"
-.elif exists(${.CURDIR}/mk/defaults/obsolete.mk)
-.include "${.CURDIR}/mk/defaults/obsolete.mk"
+.  include "${.CURDIR}/../mk/defaults/obsolete.mk"
+.elif exists(${.CURDIR}/../../mk/defaults/obsolete.mk)
+.  include "${.CURDIR}/../../mk/defaults/obsolete.mk"
 .endif