Date: Thu, 08 Mar 2001 21:49:30 -0700 From: 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: <200103090449.f294nUs06142@billy-club.village.org> In-Reply-To: Your message of "Thu, 08 Mar 2001 21:30:38 MST." <200103090430.f294Ucs04824@billy-club.village.org> References: <200103090430.f294Ucs04824@billy-club.village.org> <20010308201422.A94052@mollari.cthul.hu> <200103090241.SAA27525@gndrsh.dnsmgr.net> <200103090349.f293nGs04577@billy-club.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
The previous patches are bogus and won't work. Make doesn't let you
do
__d:=1
__d:=${__d}2
Also, the previous patches don't include bsd.own.mk, which we depend
on being included to define OBJFORMAT. So I backed that part of them
out.
Warner
Index: share/mk/sys.mk
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/share/mk/sys.mk,v
retrieving revision 1.50
diff -u -r1.50 sys.mk
--- share/mk/sys.mk 2001/02/22 11:14:25 1.50
+++ share/mk/sys.mk 2001/03/09 04:48:29
@@ -236,20 +236,16 @@
.endif
-.if exists(/etc/defaults/make.conf)
-.include </etc/defaults/make.conf>
+__d=
+.for __i in .. ../.. ../../.. ../../../.. ../../../../.. ../../../../../.. \
+ ../../../../../../.. ../../../../../../../.. ../../../../../../../../..
+.if exists(${__d}${.CURDIR}/${__i}/etc/defaults/make.conf)
+.include "${__d}${.CURDIR}/${__i}/etc/defaults/make.conf"
+__d:=--
.endif
+.endfor
+.undef __d
-.if exists(/etc/make.conf)
-.include </etc/make.conf>
-.endif
-
.include <bsd.cpu.mk>
-
-.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
-
.include <bsd.own.mk>
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/etc/defaults/make.conf,v
retrieving revision 1.147
diff -u -r1.147 make.conf
--- etc/defaults/make.conf 2001/02/27 11:21:47 1.147
+++ etc/defaults/make.conf 2001/03/09 04:49:19
@@ -366,3 +366,13 @@
#SENDMAIL_LDFLAGS=
#SENDMAIL_LDADD=
#SENDMAIL_DPADD=
+
+__d=
+.for __i in .. ../.. ../../.. ../../../.. ../../../../.. ../../../../../.. \
+ ../../../../../../.. ../../../../../../../.. ../../../../../../../../..
+.if exists(${__d}${.CURDIR}/${__i}/etc/make.conf)
+.include "${__d}${.CURDIR}/${__i}/etc/make.conf"
+__d:=--
+.endif
+.endfor
+.undef __d
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103090449.f294nUs06142>