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.173
retrieving revision 1.181
diff -u -p -r1.173 -r1.181
--- src/Makefile	2002/05/02 22:13:30	1.173
+++ src/Makefile	2002/07/10 18:55:20	1.181
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.173 2002/05/02 22:13:30 sommerfeld Exp $
+#	$NetBSD: Makefile,v 1.181 2002/07/10 18:55:20 thorpej 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:
@@ -94,22 +94,29 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-afterinstall: postinstall-check
+.if defined(UNPRIVED)
+NOPOSTINSTALL=	# defined
+.endif
+
+afterinstall:
 .if ${MKMAN} != "no"
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 .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)
+.endif
 
 postinstall-check:
 	@echo "   === Post installation checks ==="
-	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR}/etc -d ${DESTDIR}/etc check
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
 	@echo "   ================================"
 
 postinstall-fix: .NOTMAIN
 	@echo "   === Post installation fixes ==="
-	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR}/etc -d ${DESTDIR}/etc fix
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
 	@echo "   ================================"
 
 
@@ -155,12 +162,19 @@ build:
 # Build a full distribution, but not a release (i.e. no sets into
 # ${RELEASEDIR}).
 
-distribution: build
+distribution:
+#	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
+.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
+	(cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist)
+.endif
 
-# Build a release or snapshot (implies "make build").
+# 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: build
+release snapshot:
+	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
 
 # Special components of the "make build" process.
@@ -210,9 +224,6 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
-clean:
-	rm -f METALOG
-
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>