sync with netbsd 960418

1 files changed, 29 insertions, 20 deletions

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 62a73019ea9..479e128cc66 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,5 +1,5 @@
-#	$OpenBSD: bsd.README,v 1.7 1996/03/05 11:12:34 mickey Exp $
-#	$NetBSD: bsd.README,v 1.15 1996/01/22 22:46:06 cgd Exp $
+#	$OpenBSD: bsd.README,v 1.8 1996/04/22 01:28:33 deraadt Exp $
+#	$NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #	@(#)bsd.README	5.1 (Berkeley) 5/11/90
 
 This is the README file for the new make "include" files for the BSD
@@ -98,13 +98,19 @@ it exists.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-The include file <bsd.own.mk> contains the owners, groups, etc. for both
-manual pages and binaries.
+The include file <bsd.own.mk> contains source tree configuration parameters,
+such as the owners, groups, etc. for both manual pages and binaries, and
+a few global "feature configuration" parameters.
 
 It has no targets.
 
-It sets the following variables, if they are not already defined (defaults
-are in brackets):
+To get system-specific configuration parameters, bsd.own.mk will try to
+include the file specified by the "MAKECONF" variable.  If MAKECONF is not
+set, or no such file exists, the system make configuration file, /etc/mk.conf
+is included.  These files may define any of the variables described below.
+
+bsd.own.mk sets the following variables, if they are not already defined
+(defaults are in brackets):
 
 BSDSRCDIR	The real path to the system sources, so that 'make obj'
 		will work correctly. [/usr/src]
@@ -167,9 +173,10 @@ COPY		The flag passed to the install program to cause the binary
 		can either be installed with copies, or with moves using
 		a single knob. [-c]
 
-Additionally, the following variables may be set to modify the behaviour
-of the system build process (default values are in brackets along with
-comments, if set by bsd.own.mk):
+Additionally, the following variables may be set by bsd.own.mk or in a
+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):
 
 SKEY		Compile in support for S/key authentication. [yes, set
 		unconditionally]
@@ -192,7 +199,7 @@ NOPIC		Do not build PIC versions of system libraries, and
 
 NOLINT		Do not build lint libraries. [set, set unconditionally]
 
-This file is generally useful when building your own Makefiles so that
+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.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -201,7 +208,7 @@ The include file <bsd.prog.mk> handles building programs from one or
 more source files, along with their manual pages.  It has a limited number
 of suffixes, consistent with the current needs of the BSD tree.
 
-It has seven targets:
+It has eight targets:
 
 	all:
 		build the program and its manual page
@@ -214,6 +221,8 @@ It has seven targets:
 	depend:
 		make the dependencies for the source files, and store
 		them in the file .depend.
+	includes:
+		install any header files.
 	install:
 		install the program and its manual pages; if the Makefile
 		does not itself define the target install, the targets
@@ -328,12 +337,12 @@ If foo has multiple source files, add the line:
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 The include file <bsd.subdir.mk> contains the default targets for building
-subdirectories.  It has the same seven targets as <bsd.prog.mk>: all, clean,
-cleandir, depend, install, lint, and tags.  For all of the directories
-listed in the variable SUBDIRS, the specified directory will be visited
-and the target made.  There is also a default target which allows the
-command "make subdir" where subdir is any directory listed in the variable
-SUBDIRS.
+subdirectories.  It has the same eight targets as <bsd.prog.mk>: all, 
+clean, cleandir, depend, includes, install, lint, and tags.  For all of
+the directories listed in the variable SUBDIRS, the specified directory 
+will be visited and the target made.  There is also a default target which
+allows the command "make subdir" where subdir is any directory listed in
+the variable SUBDIRS.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
@@ -346,9 +355,9 @@ yacc that allow multiple lex and yacc targets to be built in parallel.
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 The include file <bsd.lib.mk> has support for building libraries.  It has
-the same seven targets as <bsd.prog.mk>: all, clean, cleandir, depend,
-install, lint, and tags.  It has a limited number of suffixes, consistent
-with the current needs of the BSD tree.
+the same eight targets as <bsd.prog.mk>: all, clean, cleandir, depend,
+includes, install, lint, and tags.  It has a limited number of suffixes,
+consistent with the current needs of the BSD tree.
 
 It sets/uses the following variables: