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.212
retrieving revision 1.215
diff -u -p -r1.212 -r1.215
--- src/Makefile	2003/07/17 07:46:11	1.212
+++ src/Makefile	2003/07/20 13:03:47	1.215
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.212 2003/07/17 07:46:11 lukem Exp $
+#	$NetBSD: Makefile,v 1.215 2003/07/20 13:03:47 wiz Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -19,18 +19,21 @@
 #   DESTDIR is the target directory for installation of the compiled
 #	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
+#   MKMAN, if `no', will prevent building of manual pages.
+#   MKOBJDIRS, if not `no', will build object directories at
 #	an appropriate point in a build.
-#   MKSHARE, if set to `no', will prevent building and installing
+#   MKSHARE, if `no', will prevent building and installing
 #	anything in /usr/share.
-#   UPDATE, if defined, will avoid a `make cleandir' at the start of
+#   MKUPDATE, if not `no', will avoid a `make cleandir' at the start of
 #	`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'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
 #
+#   See mk.conf(5) for more details.
+#
+#
 # Targets:
 #   build:
 #	Builds a full release of NetBSD in DESTDIR, except for the
@@ -123,7 +126,7 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.if defined(UNPRIVED)
+.if ${MKUNPRIVED} != "no"
 NOPOSTINSTALL=	# defined
 .endif
 
@@ -131,7 +134,7 @@ afterinstall:
 .if ${MKMAN} != "no"
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
-.if defined(UNPRIVED) && (${MKINFO} != "no")
+.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
 	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
 .endif
 .if !defined(NOPOSTINSTALL)
@@ -159,7 +162,7 @@ postinstall-fix-obsolete: .NOTMAIN
 #
 
 BUILDTARGETS+=	check-tools
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
+.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
 .if ${MKOBJDIRS} != "no"
@@ -370,9 +373,10 @@ params:
 .for var in	BSDSRCDIR BSDOBJDIR BUILDID DESTDIR EXTERNAL_TOOLCHAIN \
 		KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
 		MACHINE MACHINE_ARCH MAKECONF MAKEFLAGS \
-		MAKEOBJDIR MAKEOBJDIRPREFIX MKOBJDIRS \
+		MAKEOBJDIR MAKEOBJDIRPREFIX \
+		MKOBJDIRS MKUNPRIVED MKUPDATE \
 		RELEASEDIR TOOLCHAIN_MISSING TOOLDIR \
-		UNPRIVED UPDATE USETOOLS
+		USETOOLS
 .if defined(${var})
 	@printf "%20s = '%-s'\n" ${var} ${${var}:Q}
 .else