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.116
diff -u -p -r1.113 -r1.116
--- src/Makefile	2000/04/11 08:21:41	1.113
+++ src/Makefile	2000/05/18 23:16:28	1.116
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.113 2000/04/11 08:21:41 mrg Exp $
+#	$NetBSD: Makefile,v 1.116 2000/05/18 23:16:28 thorpej 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
@@ -44,7 +44,7 @@ SRCTOP=.
 .endif
 
 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}
@@ -59,6 +59,9 @@ _M=-m ${DESTDIR}/usr/share/mk
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
 .if make(obj)
 SUBDIR+= distrib
+.ifdef MAKEOBJDIRPREFIX
+SUBDIR+= etc
+.endif
 .endif
 
 includes-lib: includes-include includes-sys
@@ -90,7 +93,7 @@ beforeinstall:
 .ifndef DESTDIR
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
 .else
-	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
+	(cd ${.CURDIR}/etc && ${MAKE} ${_M} distrib-dirs)
 .endif
 .endif
 
@@ -117,15 +120,15 @@ build: buildmsg beforeinstall
 	@false
 .endif
 .if ${MKSHARE} != "no"
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
+	(cd ${.CURDIR}/share/mk && ${MAKE} ${_M} install)
 .endif
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
 	${MAKE} ${_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"