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.113
retrieving revision 1.121
diff -u -p -r1.113 -r1.121
--- src/Makefile	2000/04/11 08:21:41	1.113
+++ src/Makefile	2000/10/07 17:18:17	1.121
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.113 2000/04/11 08:21:41 mrg Exp $
+#	$NetBSD: Makefile,v 1.121 2000/10/07 17:18:17 deberg 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
@@ -27,6 +27,9 @@
 #	'make build'. It defaults to 1.
 #   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.
+#   NOCLEANDIR will avoid a `make cleandir' at the start of `make build',
+#	but without having the effects listed in /usr/share/mk/bsd.README.
+#   NOINCLUDES will avoid the `make includes' usually done by `make build'.
 #
 # Targets:
 #   build: builds a full release of netbsd in DESTDIR. If BUILD_DONE is
@@ -36,15 +39,10 @@
 #	more information on this.)
 #   snapshot: a synonym for release.
 
-SRCTOP=.
-.include <bsd.crypto.mk>		# for configuration variables.
-
-.if defined(CRYPTOPATH)
-.sinclude "${CRYPTOPATH}/Makefile.frag"
-.endif
+.include <bsd.own.mk>
 
 MKOBJDIRS ?= no
-HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
+HAVE_EGCS!=	${CXX} --version | egrep "^(2\.[89]|egcs)" ; echo
 
 .if defined(NBUILDJOBS)
 _J= -j${NBUILDJOBS}
@@ -57,8 +55,11 @@ _M=-m ${DESTDIR}/usr/share/mk
 # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
 
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
-.if make(obj)
+.if make(cleandir) || make(obj)
 SUBDIR+= distrib
+.ifdef MAKEOBJDIRPREFIX
+SUBDIR+= etc
+.endif
 .endif
 
 includes-lib: includes-include includes-sys
@@ -85,10 +86,18 @@ buildmsg:
 	@echo -n "Build started at: "
 	@date
 
+# If sharesrc is around, use its share/mk files to bootstrap until the
+# mk files are installed (first step of make build).  If installing to
+# DESTDIR, don't bother, since the build will fail later on anyway.
+
 beforeinstall:
 .ifndef NODISTRIBDIRS
 .ifndef DESTDIR
+.if exists(share/mk)
+	(cd ${.CURDIR}/etc && ${MAKE} -m ${.CURDIR}/share/mk DESTDIR=/ distrib-dirs)
+.else
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+.endif
 .else
 	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
 .endif
@@ -120,12 +129,12 @@ build: buildmsg beforeinstall
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
 .endif
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
-	${MAKE} ${_M} cleandir
+	${MAKE} ${_J} ${_M} cleandir
 .endif
 .if ${MKOBJDIRS} != "no"
-	${MAKE} obj
+	${MAKE} ${_M} obj
 .endif
-.if empty(HAVE_GCC28)
+.if empty(HAVE_EGCS)
 .if defined(DESTDIR)
 	@echo "*** CAPUTE!"
 	@echo "    You attempted to compile the world without egcs.  You must"
@@ -149,9 +158,6 @@ build: buildmsg beforeinstall
 	(cd ${.CURDIR}/gnu/lib && \
 	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
 	    ${MAKE} ${_M} MKSHARE=no install)
-.if target(cryptobuild)
-	${MAKE} ${_M} ${_J} cryptobuild
-.endif
 	${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install
 .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
 	(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build)