Date: Tue, 27 Mar 2001 05:53:46 -0800 (PST)
From: kway@wgate.com
To: freebsd-gnats-submit@FreeBSD.org
Subject: conf/26145: [PATCH] There is no make.conf equivalent to ${rc_conf_files}
Message-ID: <200103271353.f2RDrkv82409@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 26145
>Category: conf
>Synopsis: [PATCH] There is no make.conf equivalent to ${rc_conf_files}
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 27 06:00:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Kevin Way
>Release: 5.0-CURRENT
>Organization:
WorldGate Communications
>Environment:
FreeBSD mymachine.mydomain 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Mar 26 16:03:07 EST 2001 me@mymachine.mydomain:/usr/obj/usr/src/sys/WGAT-DESKTOP i386
>Description:
make.conf does not provide a knob equivalent to rc_conf_files to allow the use of alternate make.conf files. This is particularly useful on 'builder' machines where one might which to use very different options for different builds.
>How-To-Repeat:
>Fix:
--- /etc/defaults/make.conf.orig Tue Mar 27 08:24:47 2001
+++ /etc/defaults/make.conf Tue Mar 27 08:51:13 2001
@@ -364,3 +364,9 @@
#SENDMAIL_LDFLAGS=
#SENDMAIL_LDADD=
#SENDMAIL_DPADD=
+
+# The ${MAKECONF} files should only contain values which override values
+# set in this file. This eases the upgrade path when defaults are changed
+# and new features are added.
+
+MAKECONF=/etc/make.conf
--- /usr/share/mk/sys.mk.orig Tue Mar 27 08:16:31 2001
+++ /usr/share/mk/sys.mk Tue Mar 27 08:40:48 2001
@3@ -240,15 +240,25 @@
.include </etc/defaults/make.conf>
.endif
+.if defined(MAKECONF) && !empty(MAKECONF)
+.for conf in ${MAKECONF}
+.if exists(${conf})
+.include "${conf}"
+.endif
+.endfor
+.else
.if exists(/etc/make.conf)
.include </etc/make.conf>
.endif
+.endif
.include <bsd.cpu.mk>
+.if !defined(MAKECONF)
.if exists(/etc/make.conf.local)
.error Error, original /etc/make.conf should be moved to the /etc/defaults/ directory and /etc/make.conf.local should be renamed to /etc/make.conf.
.include </etc/make.conf.local>
+.endif
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103271353.f2RDrkv82409>