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.94
retrieving revision 1.97
diff -u -p -r1.94 -r1.97
--- src/Makefile	1999/03/10 19:18:59	1.94
+++ src/Makefile	1999/05/27 21:03:31	1.97
@@ -1,16 +1,49 @@
-#	$NetBSD: Makefile,v 1.94 1999/03/10 19:18:59 scottr Exp $
+#	$NetBSD: Makefile,v 1.97 1999/05/27 21:03:31 christos 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
+# information, see http://www.netbsd.org/developers/releng/index.html
+#
+# Not everything you can set or do is documented in this makefile. In
+# particular, you should review the files in /usr/share/mk (especially
+# bsd.README) for general information on building programs and writing
+# Makefiles within this structure, and see the comments in src/etc/Makefile
+# for further information on installation and release set options.
+#
+# Variables listed below can be set on the make command line (highest
+# priority), in /etc/mk.conf (middle priority), or in the environment
+# (lowest priority).
+#
+# Variables:
+#   NBUILDJOBS is the number of jobs to start in parallel during a
+#	'make build'. It defaults to 1.
+#   MKMAN, if set to `no', will prevent building of manual pages.
+#   MKSHARE, if set to `no', will prevent building and installing
+#	anything in /usr/share.
+#   UPDATE will avoid a `make cleandir' at the start of `make build',
+#	as well as having the effects listed in /usr/share/mk/bsd.README.
+#   DESTDIR is the target directory for installation of the compiled
+#	software. It defaults to /. Note that programs are built against
+#	libraries installed in DESTDIR.
+#   EXPORTABLE_SYSTEM, when set, ensures that non-exportable crypto code
+#	is not compiled or installed. EXPORTABLE_SYSTEM is ignored if
+#	the `domestic/crypto-us' subtree does not exist.
+#   FORCE_DOMESTIC, when set, forces a descent into the domestic/crypto-us tree
+#	when handling the `all', `includes', and `install' targets. This
+#	flag is incompatible with the `build' target. It's generally a
+#	bad idea to use FORCE_DOMESTIC unless the ramifications are well
+#	understood, and should never be enabled by default. FORCE_DOMESTIC
+#	is ignored if the `domestic/crypto-us' subtree does not exist.
+#
+# Targets:
+#   build: builds a full release of netbsd in DESTDIR.
+#   release: does a `make build,' and then tars up the DESTDIR files
+#	into RELEASEDIR, in release(7) format. (See etc/Makefile for
+#	more information on this.)
+#   snapshot: a synonym for release.
 
 .include <bsd.own.mk>			# for configuration variables.
 
-# Configurations variables (can be set either in /etc/mk.conf or
-# as environement variable
-# NBUILDJOBS:	the number of jobs to start in parallel in a 'make build'.
-#		defaults to 1
-# MKMAN:	if set to no, don't build and install man pages
-# MKSHARE:	if set to no, don't build or install /usr/share stuffs
-# UPDATE:	if set to 1, don't do a 'make cleandir' before compile
-# DESTDIR:	The target directory for installation (default to '/',
-#		which mean the current system is updated).
 
 HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
@@ -30,21 +63,29 @@ SUBDIR+= gnu
 # This is needed for libstdc++ and gen-params.
 includes-gnu: includes-include includes-sys
 
-# Descend into the domestic tree if it exists AND
+# Descend into the domestic/crypto-us tree if it exists AND
 #  1) the target is clean, cleandir, or obj, OR
 #  2) the the target is install or includes AND
-#    NOT compiling only "exportable" code AND
-#    doing it as part of installing a distribution.
+#     NOT compiling only "exportable" code AND
+#     doing it as part of installing a distribution, OR
+#  3) we Really Know what we're doing.  (Really!)
 #
 # NOTE:  due to the use of the make(foo) construct here, using the
 # clean, cleandir, and obj targets on the command line in conjunction
 # with any other target may produce unexpected results.
 
-.if exists(domestic) && \
+.if exists(domestic)
+DOMESTIC=domestic
+.elif exists(crypto-us)
+DOMESTIC=crypto-us
+.endif
+
+.if defined(DOMESTIC) && \
     (make(clean) || make(cleandir) || make(obj) || \
     ((make(includes) || make(install)) && \
-    !defined(EXPORTABLE_SYSTEM) && defined(_DISTRIB)))
-SUBDIR+= domestic
+	!defined(EXPORTABLE_SYSTEM) && defined(_DISTRIB)) || \
+    defined(FORCE_DOMESTIC))
+SUBDIR+= ${DOMESTIC}
 .endif
 
 .if exists(regress)
@@ -80,6 +121,12 @@ whatis.db:
 # as the build will automatically remove/replace the non-pkg entries there.
 
 build: beforeinstall
+.if defined(FORCE_DOMESTIC)
+	@echo '*** CAPUTE!'
+	@echo '    The FORCE_DOMESTIC flag is not compatible with "make build".'
+	@echo '    Please correct the problem and try again.'
+	@false
+.endif
 .if ${MKSHARE} != "no"
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
 	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
@@ -110,8 +157,8 @@ build: beforeinstall
 	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \
 	    ${MAKE} MKMAN=no MKINFO=no install)
 	${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
-.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)
+.if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
+	(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build)
 .endif
 	${MAKE} whatis.db
 	@echo -n "Build finished at: "