diff options
| author | jlam <jlam@pkgsrc.org> | 2004-10-06 20:59:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-10-06 20:59:40 +0000 |
| commit | f8946737f1b84503239dface55031fb3c19331be (patch) | |
| tree | 496796ec7583af1163401ad9bf0dd5e1023628ab /mk | |
| parent | dffc19378a3500a7dcfff207ba9dff3a66264901 (diff) | |
| download | pkgsrc-f8946737f1b84503239dface55031fb3c19331be.tar.gz | |
Climb up the directory tree to find the top, instead of guessing where
the top and searching on the way down. Thanks Gavan!
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 10 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 5dd150dc60b..db196d0cee2 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ OBJECT_FMT?= a.out .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 --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index cd4e06b3e5c..08d12e13803 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -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 @@ XEN12_USE_COM2?= NO #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 |