summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-03-18 07:39:27 +0000
committerimp <imp@FreeBSD.org>2002-03-18 07:39:27 +0000
commita5aa67ad0898927e353a7f6c1a4d8b3a03bcca39 (patch)
tree63ad13ea3ec515f8e9a9a737997e7ff0bf1e9e68 /share
parentb17962a441d9c964908935a7ec550fc22629c695 (diff)
downloadFreeBSD-src-a5aa67ad0898927e353a7f6c1a4d8b3a03bcca39.zip
FreeBSD-src-a5aa67ad0898927e353a7f6c1a4d8b3a03bcca39.tar.gz
__MAKE_CONF?=/etc/make.conf
Use this where we are now using /etc/make.conf. This allows people to override the current default of always including /etc/make.conf. Setting __MAKE_CONF to /dev/null disables it completely, while setting it to something else allows one to override what is on the system. This can be desirable in situations where a machine has many users and some of them want different defaults, or defaults appropriate to cross building to be different than those for normal building. Not objected to by: arch@
Diffstat (limited to 'share')
-rw-r--r--share/mk/sys.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index c0f72bd..d804c90 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -247,8 +247,9 @@ HTAGSFLAGS=
.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>
OpenPOWER on IntegriCloud