Date: Fri, 31 Aug 2001 14:15:49 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Alexander Langer <alex@big.endian.de> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc Makefile src/etc/defaults make.conf src/games/fortune/datfiles freebsd-tips src/release/doc/en_US.ISO8859-1/relnotes/common new.sgml src/share/examples/etc README.examples make.conf src/share/man/man5 make.conf.5 src/share/man/man7 build.7 ... Message-ID: <20010831141549.A55775@sunbay.com> In-Reply-To: <20010831125424.A1012@zerogravity.kawo2.rwth-aachen.d>; from alex@big.endian.de on Fri, Aug 31, 2001 at 12:54:24PM %2B0200 References: <200108302244.f7UMipb68871@freefall.freebsd.org> <20010831112802.A32037@sunbay.com> <20010831125424.A1012@zerogravity.kawo2.rwth-aachen.d>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Aug 31, 2001 at 12:54:24PM +0200, Alexander Langer wrote:
> Thus spake Ruslan Ermilov (ru@FreeBSD.org):
>
> > Just tell me, how it is supposed to build a -CURRENT world on a -STABLE
> > machine now?
>
> Won't -STABLE's make(1) use /usr/share/mk/sys.mk, which is still including
> /etc/defaults/make.conf, which still exists on a -STABLE system?
>
My nightly -CURRENT building script doesn't think so.
During `buildworld', we use ``-m ${.CURDIR}/share/mk'' files;
see src/Makefile, the ${MAKE}'s definition.
What is the reason that make(1) should .error (read: exit 1;
the following .include is meaningless) if it encounters the
/etc/defaults/make.conf? Since the user was not supposed to
edit this file, and the only uncommented thing was BDECFLAGS,
wouldn't it be more intuitive to just stop including it, but
not bail out?
The reason for the .error in the /etc/make.conf.local case
was that it was a predecessor of /etc/make.conf; it contained
the user's overrides, and it should have been moved to a new
location to continue to take effect. This is not the case for
/etc/defaults/make.conf. Please apply the following:
Index: sys.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/sys.mk,v
retrieving revision 1.54
diff -u -r1.54 sys.mk
--- sys.mk 2001/08/30 22:44:51 1.54
+++ sys.mk 2001/08/31 11:14:39
@@ -244,11 +244,6 @@
.endif
-.if exists(/etc/defaults/make.conf)
-.error Error, /etc/defaults/make.conf has been moved to /usr/share/examples/etc/make.conf and is not included any more.
-.include </etc/defaults/make.conf>
-.endif
-
.if exists(/etc/make.conf)
.include </etc/make.conf>
.endif
Cheers,
--
Ruslan Ermilov Oracle Developer/DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010831141549.A55775>