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.42
retrieving revision 1.64
diff -u -p -r1.42 -r1.64
--- src/Makefile	1997/05/31 21:21:13	1.42
+++ src/Makefile	1998/08/22 22:05:00	1.64
@@ -1,18 +1,20 @@
-#	$NetBSD: Makefile,v 1.42 1997/05/31 21:21:13 cjs Exp $
+#	$NetBSD: Makefile,v 1.64 1998/08/22 22:05:00 tv Exp $
 
 .include <bsd.own.mk>			# for configuration variables.
 
+HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
+
 # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
 
-SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share
+SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
 
 .if exists(games)
 SUBDIR+= games
 .endif
 
 SUBDIR+= gnu
-
-SUBDIR+= sys
+# This is needed for libstdc++ and gen-params.
+includes-gnu: includes-include includes-sys
 
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
 SUBDIR+= domestic
@@ -29,6 +31,10 @@ regression-tests:
 .endif
 
 beforeinstall:
+.ifmake build
+	@echo -n "Build started at: "
+	@date
+.endif
 .ifndef DESTDIR
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
 .else
@@ -40,19 +46,60 @@ afterinstall:
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
-build:
+build: beforeinstall
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	${MAKE} includes
+	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
 .if !defined(UPDATE)
 	${MAKE} cleandir
 .endif
-	(cd ${.CURDIR}/lib/csu && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	${MAKE} includes
+	(cd ${.CURDIR}/lib/csu && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+	(cd ${.CURDIR}/lib && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+	(cd ${.CURDIR}/gnu/lib && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.if defined(USE_EGCS)
+	(cd ${.CURDIR}/gnu/lib/libgcc && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.else
+.if	(${MACHINE_ARCH} != "alpha") && \
+	(${MACHINE_ARCH} != "powerpc")
+	(cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.endif
+.endif
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \
-	    ${MAKE} install)
+# libtelnet depends on libdes and libkrb.  libkrb depends on
+# libcom_err.
+.if exists(domestic/lib/libdes)
+	(cd ${.CURDIR}/domestic/lib/libdes && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.endif
+.if exists(domestic/lib/libcom_err)
+	(cd ${.CURDIR}/domestic/lib/libcom_err && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.endif
+.if exists(domestic/lib/libkrb)
+	(cd ${.CURDIR}/domestic/lib/libkrb && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.endif
+	(cd ${.CURDIR}/domestic/lib && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
 .endif
 	${MAKE} depend && ${MAKE} && ${MAKE} install
+.if defined(USE_EGCS)
+.if defined(DESTDIR) && (${HAVE_GCC28} == "")
+	@echo '***** WARNING ***** Your system compiler is not GCC 2.8 or higher'
+	@echo 'and you have built a distribution with GCC 2.8 and DESTDIR set.'
+	@echo 'You will need to rebuild libgcc from gnu/usr.bin/egcs/libgcc'
+	@echo 'in order to have full C++ support in the binary set.'
+.else
+	(cd ${.CURDIR}/gnu/lib/libgcc &&\
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+.endif # DESTDIR && !HAVE_GCC28
+.endif # USE_EGCS
+	@echo -n "Build finished at: "
+	@date
 
 .include <bsd.subdir.mk>