From bc5cbb553551af65e2ce680200b4d8ffaab4e0f7 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 27 Jan 2002 20:01:56 +0000
Subject: Prevent /etc/mk.conf from being included by BSD-style makefiles used
 by packages themselves, as /etc/mk.conf may contain harmful settings for
 package builds.  Just to clarify, /etc/mk.conf is still included by the
 Makefiles in pkgsrc, just not by the Makefiles used to build the software
 itself.  This should fix pkg/15297 by gabriel rosenkoetter
 <gr@grappa.eclipsed.net>.

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

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index d1e23496e5a..a3076285f5a 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.915 2002/01/27 19:07:41 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.916 2002/01/27 20:01:56 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -20,6 +20,11 @@
 ##### Include any preferences, if not already included, and common definitions
 .include "../../mk/bsd.prefs.mk"
 
+##### 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.
+MAKE_ENV+=	MAKECONF=/dev/null
+
 ##### Pass information about desired toolchain to package build.
 .if defined(USETOOLS)
 MAKE_ENV+=	USETOOLS="${USETOOLS}"
-- 
cgit v1.2.3