From owner-freebsd-arch  Thu Mar  8 23:22:56 2001
Delivered-To: freebsd-arch@freebsd.org
Received: from obsecurity.dyndns.org (adsl-63-207-60-158.dsl.lsan03.pacbell.net [63.207.60.158])
	by hub.freebsd.org (Postfix) with ESMTP id 2C5AA37B719
	for <arch@FreeBSD.ORG>; Thu,  8 Mar 2001 23:22:53 -0800 (PST)
	(envelope-from kris@obsecurity.org)
Received: by obsecurity.dyndns.org (Postfix, from userid 1000)
	id CF1F666C95; Thu,  8 Mar 2001 23:22:52 -0800 (PST)
Date: Thu, 8 Mar 2001 23:22:52 -0800
From: Kris Kennaway <kris@obsecurity.org>
To: Warner Losh <imp@village.org>
Cc: Kris Kennaway <kris@obsecurity.org>,
	"Rodney W. Grimes" <freebsd@gndrsh.dnsmgr.net>,
	"Matthew D. Fuller" <fullermd@futuresouth.com>, arch@FreeBSD.ORG
Subject: Re: Breaking up make.conf
Message-ID: <20010308232252.A95896@mollari.cthul.hu>
References: <20010308201422.A94052@mollari.cthul.hu> <200103090241.SAA27525@gndrsh.dnsmgr.net> <200103090349.f293nGs04577@billy-club.village.org> <20010308201422.A94052@mollari.cthul.hu> <200103090430.f294Ucs04824@billy-club.village.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-md5;
	protocol="application/pgp-signature"; boundary="FL5UXtIhxfXey3p5"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <200103090430.f294Ucs04824@billy-club.village.org>; from imp@village.org on Thu, Mar 08, 2001 at 09:30:38PM -0700
Sender: owner-freebsd-arch@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


--FL5UXtIhxfXey3p5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Mar 08, 2001 at 09:30:38PM -0700, Warner Losh wrote:

> --- etc/defaults/make.conf	2001/02/27 11:21:47	1.147
> +++ etc/defaults/make.conf	2001/03/09 04:23:06
> @@ -366,3 +366,16 @@
>  #SENDMAIL_LDFLAGS=
>  #SENDMAIL_LDADD=
>  #SENDMAIL_DPADD=
> +
> +__d := ${.CURDIR}
> +.for __i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
> +.if exists(${__d}/etc/make.conf)
> +.include "${__d}/etc/make.conf"
> +.endif
> +__d:=${__d}/..
> +.endfor
> +.undef __d
> +
> +.include <bsd.cpu.mk>
> +
> +.include <bsd.own.mk>

Will respond to the rest of this later when I've thought about it a
bit more, but if we do this then we have to also protect the above
section from being included twice -- lots of people copy
/etc/defaults/make.conf to /etc/make.conf as a basis for editing.

I thought the above way of doing this is uglier than keeping it in
sys.mk, which is why I didn't suggest it.

Kris

--FL5UXtIhxfXey3p5
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (FreeBSD)
Comment: For info see http://www.gnupg.org

iD8DBQE6qITMWry0BWjoQKURAkH8AKCEEzoQdUvM5HVjR3EyKreIsYrMOwCg20nZ
HFs63NPDUU49W1y87HuGB98=
=tBvi
-----END PGP SIGNATURE-----

--FL5UXtIhxfXey3p5--

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