CVSUP and 5.2.1 RELEASE

[Marcel Moolenaar]

On Tue, Jul 13, 2004 at 06:23:38PM -0400, Garance A Drosihn wrote:
> 
> a) how about if we print a warning and exit if DESTDIR is
>    not defined?  Are there "important" uses of `make world'
>    which do not use DESTDIR?

My thoughts exactly. See attached patch.

-- 
 Marcel Moolenaar	  USPA: A-39004		 marcel at xcllnt.net
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/Makefile,v
retrieving revision 1.300
diff -u -r1.300 Makefile
--- Makefile	9 Jul 2004 13:55:50 -0000	1.300
+++ Makefile	13 Jul 2004 23:18:27 -0000
@@ -144,14 +144,17 @@
 # Set a reasonable default
 .MAIN:	all
 
+.if defined(DESTDIR)
 .if make(world)
 STARTTIME!= LC_ALL=C date
 .endif
 #
 # world
 #
-# Attempt to rebuild and reinstall *everything*, with reasonable chance of
-# success, regardless of how old your existing system is.
+# Attempt to rebuild and reinstall everything. This target is not to be
+# used for upgrading an existing FreeBSD system, because the kernel is
+# not included. One can argue that this target doesn't build everything
+# then.
 #
 world: upgrade_checks
 	@echo "--------------------------------------------------------------"
@@ -178,6 +181,16 @@
 	@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 "'Using make world', for how to upgrade your system."
+	@echo "Define DESTDIR to the where you want to install FreeBSD,
+	@echo "including /, to override this warning and proceed as usual."
+	@echo "You have been warned..."
+.endif
 
 #
 # kernel