summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-11-28 12:05:20 +0000
committerjlam <jlam@pkgsrc.org>2001-11-28 12:05:20 +0000
commit22116387be8336fffcca3ab80414bf59f84c60d2 (patch)
treeff53d931d16292cf4e187be8825d65425503d1f6
parent58d12a8d22460d48f4fe3d3e16aa372298126ea0 (diff)
downloadpkgsrc-22116387be8336fffcca3ab80414bf59f84c60d2.tar.gz
Fix problem where bsd.pkg.obsolete.mk wouldn't be found when "make" was
executed outside of a package directory. Problem and fix noted by Stoned Elipot in private email.
-rw-r--r--mk/bsd.pkg.defaults.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 1a598ba6e40..8eb73e628d9 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.18 2001/11/27 02:07:53 hubertf Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.19 2001/11/28 12:05:20 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -1309,4 +1309,10 @@ XCHAT_USE_SSL?= YES
#MASTER_SITE_BACKUP= ftp://sunsite.org.uk/packages/NetBSD/packages/distfiles/ \
# ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
-.include "../../mk/bsd.pkg.obsolete.mk"
+.if exists(${.CURDIR}/../../mk/bsd.pkg.obsolete.mk)
+.include "${.CURDIR}/../../mk/bsd.pkg.obsolete.mk"
+.elif exists(${.CURDIR}/../mk/bsd.pkg.obsolete.mk)
+.include "${.CURDIR}/../mk/bsd.pkg.obsolete.mk"
+.elif exists(${.CURDIR}/mk/bsd.pkg.obsolete.mk)
+.include "${.CURDIR}/mk/bsd.pkg.obsolete.mk"
+.endif