From 5522ce89d047592beafd68cb02ed40c478e336fb Mon Sep 17 00:00:00 2001
From: erh <erh@pkgsrc.org>
Date: Wed, 3 Dec 2003 18:13:28 +0000
Subject: If PKGMAKECONF is defined, use it to set MAKECONF instead of
 "/dev/null".

---
 mk/bsd.pkg.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index f6a3e767bf3..cfb0a32fd48 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1308 2003/12/02 23:08:24 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1309 2003/12/03 18:13:28 erh Exp $
 #
 # This file is in the public domain.
 #
@@ -23,7 +23,11 @@
 ##### Prevent /etc/mk.conf from being included by a distribution's BSD-style
 ##### Makefiles.  We really don't want to pick up settings that are used by
 ##### builds in /usr/src, e.g. DESTDIR.
+.if defined(PKGMAKECONF)
+MAKE_ENV+=	MAKECONF=${PKGMAKECONF}
+.else
 MAKE_ENV+=	MAKECONF=/dev/null
+.endif
 
 ##### Pass information about desired toolchain to package build.
 .if defined(USETOOLS)
-- 
cgit v1.2.3