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.175.2.3
retrieving revision 1.176
diff -u -p -r1.175.2.3 -r1.176
--- src/Makefile	2002/11/30 15:27:33	1.175.2.3
+++ src/Makefile	2002/06/19 00:17:11	1.176
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.175.2.3 2002/11/30 15:27:33 he Exp $
+#	$NetBSD: Makefile,v 1.176 2002/06/19 00:17: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
@@ -19,15 +19,15 @@
 #	software. It defaults to /. Note that programs are built against
 #	libraries installed in DESTDIR.
 #   MKMAN, if set to `no', will prevent building of manual pages.
-#   MKOBJDIRS, if not set to `no', will build object directories at
+#   MKOBJDIRS, if not set to `no', will build object directories at 
 #	an appropriate point in a build.
 #   MKSHARE, if set to `no', will prevent building and installing
 #	anything in /usr/share.
 #   UPDATE, if defined, will avoid a `make cleandir' at the start of
-#	`make build', as well as having the effects listed in
-#	/usr/share/mk/bsd.README.
+#     `make build', as well as having the effects listed in
+#     /usr/share/mk/bsd.README.
 #   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
-#	of the `make build'.
+#     of the `make build'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
 #
 # Targets:
@@ -48,7 +48,6 @@
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
 #   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-build:        builds and installs the entire system.
@@ -95,10 +94,6 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.if defined(UNPRIVED)
-NOPOSTINSTALL=	# defined
-.endif
-
 afterinstall:
 .if ${MKMAN} != "no"
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
@@ -106,8 +101,8 @@ afterinstall:
 .if defined(UNPRIVED) && (${MKINFO} != "no")
 	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
 .endif
-.if !defined(NOPOSTINSTALL)
-	(cd ${.CURDIR} && ${MAKE} postinstall-check)
+.if !defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/"
+	(${MAKE} postinstall-check)
 .endif
 
 postinstall-check:
@@ -139,7 +134,7 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib do-gnu-lib do-build
+BUILDTARGETS+=	do-lib-csu do-lib do-gnu-lib do-build
 
 # Enforce proper ordering of some rules.
 
@@ -163,14 +158,12 @@ build:
 # Build a full distribution, but not a release (i.e. no sets into
 # ${RELEASEDIR}).
 
-distribution:
-	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
+distribution: build
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
 
 # Build a release or snapshot (implies "make build").
 
-release snapshot:
-	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
+release snapshot: build
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
 
 # Special components of the "make build" process.
@@ -192,7 +185,7 @@ do-distrib-dirs:
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
 .endif
 
-.for dir in tools lib/csu lib/libc lib gnu/lib
+.for dir in tools lib/csu lib gnu/lib
 do-${dir:S/\//-/}:
 .for targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})