From cb4b88bb46a0b1f47cd46a08de2d90abc4acbb37 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Sun, 21 Feb 1999 01:24:22 +0000
Subject: Pull in mk.conf (via bsd.pref.mk), so that e.g. PKG_MISC_TARGETS can
 be set there.

---
 mk/bsd.pkg.subdir.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index ad1afc2953a..9f217e85b57 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.subdir.mk,v 1.23 1998/12/29 22:31:53 tron Exp $
+#	$NetBSD: bsd.pkg.subdir.mk,v 1.24 1999/02/21 01:24:22 hubertf Exp $
 #	Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp 
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
 #
@@ -31,6 +31,16 @@
 #	mirror-distfiles
 #
 
+# Pull in stuff from mk.conf - need to check two places as this may be
+# called from pkgsrc or from pkgsrc/category.
+.if exists(${.CURDIR}/mk/bsd.prefs.mk)
+.include "${.CURDIR}/mk/bsd.prefs.mk"
+.else
+.if exists(${.CURDIR}/../mk/bsd.prefs.mk)
+.include "${.CURDIR}/../mk/bsd.prefs.mk"
+.endif	# exists(${.CURDIR}/../mk/bsd.prefs.mk)
+.endif	# exists(${.CURDIR}/mk/bsd.prefs.mk)
+
 
 .MAIN: all
 
-- 
cgit v1.2.3