cvs commit: src Makefile README

[David O'Brien]

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:

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 at FreeBSD.org)