Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.192
retrieving revision 1.212
diff -u -p -r1.192 -r1.212
--- src/Makefile	2002/12/02 08:27:03	1.192
+++ src/Makefile	2003/07/17 07:46:11	1.212
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.192 2002/12/02 08:27:03 lukem Exp $
+#	$NetBSD: Makefile,v 1.212 2003/07/17 07:46:11 lukem Exp $
 
+#
 # This is the top-level makefile for building NetBSD. For an outline of
 # how to build a snapshot or release, as well as other release engineering
 # information, see http://www.netbsd.org/developers/releng/index.html
@@ -32,14 +33,29 @@
 #
 # Targets:
 #   build:
-#	Builds a full release of NetBSD in DESTDIR.  If BUILD_DONE is
-#	set, this is an empty target.
+#	Builds a full release of NetBSD in DESTDIR, except for the
+#	/etc configuration files.
+#	If BUILD_DONE is set, this is an empty target.
+#   distribution:
+#	Builds a full release of NetBSD in DESTDIR, including the /etc
+#	configuration files.
+#   buildworld:
+#	As per `make distribution', except that it ensures that DESTDIR
+#	is not the root directory.
+#   installworld:
+#	Install the distribution from DESTDIR to INSTALLWORLDDIR (which
+#	defaults to the root directory).  Ensures that INSTALLWORLDDIR
+#	is the not root directory if cross compiling.
 #   release:
-#	Does a `make build,' and then tars up the DESTDIR files
-#	into RELEASEDIR, in release(7) format. (See etc/Makefile for
-#	more information on this.)
+#	Does a `make build', and then tars up the DESTDIR files
+#	into RELEASEDIR/${MACHINE}, in release(7) format.
+#	(See etc/Makefile for more information on this.)
 #   regression-tests:
 #	Runs the regression tests in "regress" on this host.
+#   sets:
+#	Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}
+#   sourcesets:
+#	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
@@ -47,27 +63,36 @@
 #   do-tools:        builds host toolchain.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
+#   do-tools-compat: builds the "libnbcompat" library; needed for some
+#                    random host tool programs in the source tree.
+#   do-gnu-lib-libgcc: builds and installs prerequisites from gnu/lib/libgcc
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.
 #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
 #   do-build:        builds and installs the entire system.
+#   do-obsolete:     builds and installs the entire system.
+#
 
 .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
 .MAKEFLAGS: -m ${.CURDIR}/share/mk
 .endif
 
+#
 # If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may
 # not be the top level objdir, because "make obj" can happen in the *middle*
 # of "make build" (long after <bsd.own.mk> is calculated it).  So, pre-set
 # _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}.
+#
 _SRC_TOP_OBJ_=
 
 .include <bsd.own.mk>
 
+#
 # Sanity check: make sure that "make build" is not invoked simultaneously
 # with a standard recursive target.
+#
 
 .if make(build) || make(release) || make(snapshot)
 .for targ in ${TARGETS:Nobj:Ncleandir}
@@ -80,9 +105,11 @@ _SRC_TOP_OBJ_=
 .endif
 
 _SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
-_SUBDIR+=	usr.sbin share rescue sys etc distrib regress
+_SUBDIR+=	usr.sbin share rescue sys etc .WAIT distrib regress
 
+#
 # Weed out directories that don't exist.
+#
 
 .for dir in ${_SUBDIR}
 .if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
@@ -113,16 +140,23 @@ afterinstall:
 
 postinstall-check:
 	@echo "   === Post installation checks ==="
-	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
 	@echo "   ================================"
 
 postinstall-fix: .NOTMAIN
 	@echo "   === Post installation fixes ==="
-	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
-	@echo "   ================================"
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	@echo "   ==============================="
 
+postinstall-fix-obsolete: .NOTMAIN
+	@echo "   === Removing obsolete files ==="
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+	@echo "   ==============================="
 
+
+#
 # Targets (in order!) called by "make build".
+#
 
 BUILDTARGETS+=	check-tools
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
@@ -140,15 +174,24 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
+BUILDTARGETS+=	do-tools-compat
+.if ${MKGCC} != "no"
+BUILDTARGETS+=	do-gnu-lib-libgcc
+.endif
 BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build
+BUILDTARGETS+=	do-obsolete
 
+#
 # Enforce proper ordering of some rules.
+#
 
 .ORDER:		${BUILDTARGETS}
 includes-lib:	includes-include includes-sys
 includes-gnu:	includes-lib
 
+#
 # Build the system and install into DESTDIR.
+#
 
 START_TIME!=	date
 
@@ -164,21 +207,72 @@ build:
 	@printf "Build finished at: " && date
 .endif
 
+#
 # Build a full distribution, but not a release (i.e. no sets into
-# ${RELEASEDIR}).
+# ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
+#
 
-distribution:
+distribution buildworld:
+.if make(buildworld) && \
+    (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Won't make ${.TARGET} with DESTDIR=/"
+	@false
+.endif
 	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
+	${MAKE} postinstall-fix-obsolete
 	(cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist)
 .endif
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
+#
+# Install the distribution from $DESTDIR to $INSTALLWORLDDIR (defaults to `/')
+# If installing to /, ensures that the host's operating system is NetBSD and
+# the host's `uname -m` == ${MACHINE}.
+#
+
+HOST_UNAME_S!=	uname -s
+HOST_UNAME_M!=	uname -m
+
+installworld:
+.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Can't make ${.TARGET} to DESTDIR=/"
+	@false
+.endif
+.if !defined(INSTALLWORLDDIR) || \
+    ${INSTALLWORLDDIR} == "" || ${INSTALLWORLDDIR} == "/"
+.if (${HOST_UNAME_S} != "NetBSD")
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLWORLDDIR=/"
+	@false
+.endif
+.if (${HOST_UNAME_M} != ${MACHINE})
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLWORLDDIR=/"
+	@false
+.endif
+.endif
+	(cd ${.CURDIR}/distrib/sets && \
+	    ${MAKE} INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS= installsets)
+	(cd ${.CURDIR} && \
+	    ${MAKE} DESTDIR=${INSTALLWORLDDIR} postinstall-check)
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
+#
+
+.for tgt in sets sourcesets
+${tgt}:
+	(cd ${.CURDIR}/distrib/sets && ${MAKE} $@)
+.endfor
+
+#
 # Build a release or snapshot (implies "make build").  Note that
 # in this case, the set lists will be checked before the tar files
 # are made.
+#
 
 release snapshot:
 	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
@@ -186,7 +280,9 @@ release snapshot:
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
+#
 # Special components of the "make build" process.
+#
 
 check-tools:
 .if ${TOOLCHAIN_MISSING} == "yes" && !defined(EXTERNAL_TOOLCHAIN)
@@ -211,8 +307,8 @@ do-${targ}: ${targ}
 	@true
 .endfor
 
-.for dir in tools lib/csu lib/libc lib gnu/lib
-do-${dir:S/\//-/}:
+.for dir in tools tools/compat lib/csu gnu/lib/libgcc lib/libc lib gnu/lib
+do-${dir:S/\//-/g}:
 .for targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
 .endfor
@@ -233,8 +329,13 @@ do-build:
 	(cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
 .endfor
 
+do-obsolete:
+	(cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists)
+
+#
 # Speedup stubs for some subtrees that don't need to run these rules.
 # (Tells <bsd.subdir.mk> not to recurse for them.)
+#
 
 .for dir in bin etc distrib games libexec regress sbin usr.sbin tools
 includes-${dir}:
@@ -245,13 +346,36 @@ install-${dir}:
 	@true
 .endfor
 
+#
 # XXX this needs to change when distrib Makefiles are recursion compliant
+# XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...
+#
 dependall-distrib depend-distrib all-distrib:
 	@true
 
+.include <bsd.sys.mk>
 .include <bsd.obj.mk>
+.include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
 
 build-docs: ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
-	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@
+	${TOOL_GROFF} -mdoc -Tascii -P-b -P-u -P-o $> >$@
+
+
+#
+# Display current make(1) parameters
+#
+params:
+.for var in	BSDSRCDIR BSDOBJDIR BUILDID DESTDIR EXTERNAL_TOOLCHAIN \
+		KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
+		MACHINE MACHINE_ARCH MAKECONF MAKEFLAGS \
+		MAKEOBJDIR MAKEOBJDIRPREFIX MKOBJDIRS \
+		RELEASEDIR TOOLCHAIN_MISSING TOOLDIR \
+		UNPRIVED UPDATE USETOOLS
+.if defined(${var})
+	@printf "%20s = '%-s'\n" ${var} ${${var}:Q}
+.else
+	@printf "%20s = (undefined)\n" ${var}
+.endif
+.endfor