Date: Thu, 22 Jun 2006 10:54:26 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: obrien@freebsd.org Cc: trhodes@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org, jhb@freebsd.org, cvs-src@freebsd.org Subject: Re: cvs commit: src Makefile README Message-ID: <20060622.105426.146405308.imp@bsdimp.com> In-Reply-To: <20060622073523.GB64578@dragon.NUXI.org> References: <20060620.144125.84360497.imp@bsdimp.com> <200606201714.10331.jhb@freebsd.org> <20060622073523.GB64578@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <20060622073523.GB64578@dragon.NUXI.org>
"David O'Brien" <obrien@freebsd.org> writes:
: On Tue, Jun 20, 2006 at 05:14:09PM -0400, John Baldwin wrote:
: > Fair enough. How about just making it undocumented again then? :)
:
: Or if 'make world' is desired to be disabled, there's also this approach:
This patch goes the wrong way.
I've committed what appears to be the closest thing this thread has
had to a consensus: leave the extra docs in the Makefile, remove the
extra docs from the echos. We don't want to make it too easy for
people, but do want to allow people clueful enough to read the
Makefile to see it easily. This is the smallest modification to the
pre-existing consensus that I could find to resolve the issue.
Warner
: Index: Makefile
: ===================================================================
: RCS file: /home/ncvs/src/Makefile,v
: retrieving revision 1.332
: diff -u -p -r1.332 Makefile
: --- Makefile 7 Jun 2006 03:33:48 -0000 1.332
: +++ Makefile 20 Jun 2006 19:10:51 -0000
: @@ -33,13 +33,6 @@
: # If you want to build your system from source be sure that /usr/obj has
: # at least 400MB of diskspace available.
: #
: -# For individuals wanting to build from the sources currently on their
: -# system, the simple instructions are:
: -#
: -# 1. `cd /usr/src' (or to the directory containing your source tree).
: -# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README).
: -# 3. `make world'
: -#
: # For individuals wanting to upgrade their sources (even if only a
: # delta of a few days):
: #
: @@ -163,7 +157,7 @@ ${TGTS}:
:
: STARTTIME!= LC_ALL=C date
:
: -.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
: +.if defined(HISTORICAL_MAKE_WORLD)
: #
: # world
: #
: @@ -197,22 +191,45 @@ world: upgrade_checks
: @echo ">>> make world completed on `LC_ALL=C date`"
: @echo " (started ${STARTTIME})"
: @echo "--------------------------------------------------------------"
: -.else
: -world:
: - @echo "WARNING: make world will overwrite your existing FreeBSD"
: - @echo "installation without also building and installing a new"
: - @echo "kernel. This can be dangerous. Please read the handbook,"
: - @echo "'Rebuilding world', for how to upgrade your system."
: - @echo "Define DESTDIR to where you want to install FreeBSD,"
: - @echo "including /, to override this warning and proceed as usual."
: - @echo "You may get the historical 'make world' behavior by defining"
: - @echo "HISTORICAL_MAKE_WORLD. You should understand the implications"
: - @echo "before doing this."
: - @echo ""
: - @echo "Bailing out now..."
: - @false
: .endif
:
: --
: -- David (obrien@FreeBSD.org)
:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060622.105426.146405308.imp>