From 92f6763b81991838e5047c9223866af2390f649b Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Wed, 19 Aug 1998 16:23:40 +0000
Subject: Don't barf if the environment sets PREFIX (just ignore it).  Needed
 for recursive makes.

---
 mk/bsd.prefs.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 9331773127d..a3a56a55909 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.2 1998/08/11 19:30:48 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.3 1998/08/19 16:23:40 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -9,6 +9,9 @@
 OPSYS!= /usr/bin/uname -s
 .endif
 
+# Don't complain about environment settings on recursive makes.
+__PREFIX_SET__=${PREFIX}
+
 .if defined(MAKECONF) && exists(${MAKECONF})
 .include "${MAKECONF}"
 .elif ${OPSYS} == "FreeBSD" && exists(/etc/make.conf)
@@ -17,7 +20,7 @@ OPSYS!= /usr/bin/uname -s
 .include "/etc/mk.conf"
 .endif
 
-.if defined(PREFIX)
+.if defined(PREFIX) && (${PREFIX} != ${__PREFIX_SET__})
 .BEGIN:
 	@${ECHO_MSG} "You can NOT set PREFIX manually or in mk.conf.  Set LOCALBASE or X11BASE"
 	@${ECHO_MSG} "depending on your needs.  See the pkg system documentation for more info."
-- 
cgit v1.2.3