Minor clean-ups:

- document some more things (MANPS, make oddities)
- put all PHONY targets in bsd.own.mk, since it's included by everything
that uses it.
- remove them from bsd.lib.mk, since it includes bsd.own.mk.
- ... except for load/unload, which are only in bsd.lkm.mk.
- fix spell target, so that it actually depends on the generated file.

okay niklas@

5 files changed, 47 insertions, 9 deletions

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 4a83f69ac41..13d2986f862 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.README,v 1.22 2000/05/15 06:10:21 niklas Exp $
+#	$OpenBSD: bsd.README,v 1.23 2001/04/03 23:00:08 espie Exp $
 #	$NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #	@(#)bsd.README	5.1 (Berkeley) 5/11/90
 
@@ -54,6 +54,25 @@ variable assignment is the overriding one, i.e. if the Makefile has:
 the command "make b" will echo "bar".  This is for compatibility with the
 way the V7 make behaved.
 
+To make things even more confusing, make uses lazy evaluation. All
+variables are expanded only when needed. Which means that, in
+
+	a=	foo
+
+	b: $(a)
+		echo $(.ALLSRC)
+		echo $(a)
+
+	foo:
+		touch foo
+
+   	a=	bar
+
+the command "make b" will echo "foo"; echo "bar".  The first $(a) means 
+"foo", because it's needed to generate the dependency rule when it's read, 
+but the second $(a) is only expanded when needed, at which point a contains
+bar.
+
 It's fairly difficult to make the BSD .mk files work when you're building
 multiple programs in a single directory.  It's a lot easier to split up the
 programs than to deal with the problem.  Most of the agony comes from making
@@ -140,6 +159,8 @@ BINMODE		Binary mode. [555]
 
 NONBINMODE	Mode for non-executable files. [444]
 
+DIRMODE		Mode for new directories. [755]
+
 MANDIR		Base path for manual installation. [/usr/share/man/cat]
 
 MANGRP		Manual group. [bin]
@@ -195,6 +216,8 @@ make configuration file to modify the behaviour of the system build
 process (default values are in brackets along with comments, if set by
 bsd.own.mk):
 
+AFS		Compile support for AFS.
+
 SKEY		Compile in support for S/key authentication. [yes, set
 		unconditionally]
 
@@ -204,6 +227,8 @@ KERBEROS5	Compile in support for Kerberos 5 authentication.
 
 MANZ		Compress manual pages at installation time.
 
+MANPS		Define to have PostScript manual pages generated.
+
 SYS_INCLUDE	Copy or symlink kernel include files into /usr/include.
 		Possible values are "symlinks" or "copies" (which is
 		the same as the variable being unset).
@@ -235,6 +260,12 @@ PIPE		If set to "-pipe" gcc will be given the -pipe option
 GLOBAL_AUTOCONF_CACHE
 		Set to the name of a file that all cached GNU autoconf
 		test results will be saved in.	Reduces redundant tests.
+		Be careful!  Redundant tests may not be redundant if you
+		are installing substantially updated gnu programs.
+
+UVM
+		Set to yes on machines that switched to the new unified
+		vm. Temporary, until everything supports uvm.
 
 bsd.own.mk is generally useful when building your own Makefiles so that
 they use the same default owners etc. as the rest of the tree.
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 992ee2ce386..a81cc64467e 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.doc.mk,v 1.7 1997/08/07 08:59:32 niklas Exp $
+#	$OpenBSD: bsd.doc.mk,v 1.8 2001/04/03 23:00:09 espie Exp $
 #	$NetBSD: bsd.doc.mk,v 1.20 1994/07/26 19:42:37 mycroft Exp $
 #	@(#)bsd.doc.mk	8.1 (Berkeley) 8/14/93
 
@@ -46,7 +46,10 @@ install:
 	${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
 	    Makefile ${FILES} ${EXTRA} ${DESTDIR}${DOCDIR}/${DIR}
 
-spell: ${SRCS}
+spell: paper.spell
+
+
+paper.spell: ${SRCS}
 	spell ${SRCS} | sort | comm -23 - spell.ok > paper.spell
 
 .include <bsd.own.mk>
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index ee8c16726da..444c3b01a7e 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.lib.mk,v 1.27 2000/10/18 11:35:50 brad Exp $
+#	$OpenBSD: bsd.lib.mk,v 1.28 2001/04/03 23:00:09 espie Exp $
 #	$NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
 #	@(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
 
@@ -284,9 +284,6 @@ afterinstall: realinstall
 realinstall: beforeinstall
 .endif
 
-.PHONY: all clean cleandir afterdepend beforeinstall realinstall \
-	maninstall afterinstall install
-
 .if !defined(NOMAN)
 .include <bsd.man.mk>
 .endif
diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk
index f879c1fd6c8..036bb97f356 100644
--- a/share/mk/bsd.lkm.mk
+++ b/share/mk/bsd.lkm.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.lkm.mk,v 1.15 2000/06/18 23:21:47 assar Exp $
+#	$OpenBSD: bsd.lkm.mk,v 1.16 2001/04/03 23:00:09 espie Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -121,3 +121,5 @@ lint: ${LOBJS}
 .include <bsd.dep.mk>
 .include <bsd.subdir.mk>
 .include <bsd.sys.mk>
+
+.PHONY: load unload
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 218afee2818..64ec01690f0 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.40 2001/02/17 00:04:55 miod Exp $
+#	$OpenBSD: bsd.own.mk,v 1.41 2001/04/03 23:00:09 espie Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -121,3 +121,8 @@ NOPROFILE=
 NOLINT=
 
 BSD_OWN_MK=Done
+
+.PHONY: spell clean cleandir obj manpages print all \
+	depend beforedepend afterdepend cleandepend \
+	all lint cleanman nlsinstall cleannls includes \
+	beforeinstall realinstall maninstall afterinstall install