From owner-freebsd-arch  Wed Mar 13 20:13: 9 2002
Delivered-To: freebsd-arch@freebsd.org
Received: from rover.village.org (rover.bsdimp.com [204.144.255.66])
	by hub.freebsd.org (Postfix) with ESMTP id A78C637B416
	for <arch@freebsd.org>; Wed, 13 Mar 2002 20:13:02 -0800 (PST)
Received: from harmony.village.org (harmony.village.org [10.0.0.6])
	by rover.village.org (8.11.3/8.11.3) with ESMTP id g2E4D1i33544
	for <arch@freebsd.org>; Wed, 13 Mar 2002 21:13:01 -0700 (MST)
	(envelope-from imp@village.org)
Received: from localhost (warner@rover2.village.org [10.0.0.1])
	by harmony.village.org (8.11.6/8.11.6) with ESMTP id g2E4CvL46115
	for <arch@freebsd.org>; Wed, 13 Mar 2002 21:13:01 -0700 (MST)
	(envelope-from imp@village.org)
Date: Wed, 13 Mar 2002 21:12:52 -0700 (MST)
Message-Id: <20020313.211252.132928159.imp@village.org>
To: arch@freebsd.org
Subject: Comments on sys.mk change to make /etc/make.conf optional
From: "M. Warner Losh" <imp@village.org>
X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-arch@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-arch.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-arch>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-arch>
X-Loop: FreeBSD.ORG

I'm posting this here because it is a fairly fundamental change to the
system.  It makes /etc/make.conf optional, for shared environments
that might want to have different settings for different users.  I
used __MAKE_CONF to try not to pollute things.  This also lets people
like bde say "setenv __MAKE_CONF /dev/null" for extreme purity.

Comments?

Warner

Index: sys.mk
===================================================================
RCS file: /base/FreeBSD-CVS/src/share/mk/sys.mk,v
retrieving revision 1.56
diff -u -r1.56 sys.mk
--- sys.mk	2001/08/31 12:20:43	1.56
+++ sys.mk	2002/03/12 18:31:36
@@ -244,8 +244,9 @@
 
 .endif
 
-.if exists(/etc/make.conf)
-.include </etc/make.conf>
+__MAKE_CONF?=/etc/make.conf
+.if exists(${__MAKE_CONF})
+.include "${__MAKE_CONF}"
 .endif
 
 .include <bsd.cpu.mk>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message