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.54
retrieving revision 1.59
diff -u -p -r1.54 -r1.59
--- src/Makefile	1998/05/21 01:40:19	1.54
+++ src/Makefile	1998/07/24 16:51:33	1.59
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.54 1998/05/21 01:40:19 thorpej Exp $
+#	$NetBSD: Makefile,v 1.59 1998/07/24 16:51:33 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 sys
@@ -47,18 +49,6 @@ afterinstall:
 build: beforeinstall
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
 	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
-.if exists(domestic) && !defined (EXPORTABLE_SYSTEM)
-.if exists(domestic/usr.bin/compile_et)
-	(cd ${.CURDIR}/domestic/usr.bin/compile_et && \
-	    ${MAKE} depend && ${MAKE} && \
-	    ${MAKE} install)
-.endif
-.if exists(domestic/usr.bin/make_cmds)
-	(cd ${.CURDIR}/domestic/usr.bin/make_cmds && \
-	    ${MAKE} depend && ${MAKE} && \
-	    ${MAKE} install)
-.endif
-.endif
 .if !defined(UPDATE)
 	${MAKE} cleandir
 .endif
@@ -66,27 +56,7 @@ build: beforeinstall
 	(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)
-.if	(${MACHINE_ARCH} == "arm32") || \
-	(${MACHINE_ARCH} == "i386") || \
-	(${MACHINE_ARCH} == "mips") || \
-	(${MACHINE_ARCH} == "m68k") || \
-	(${MACHINE_ARCH} == "ns32k") || \
-	(${MACHINE_ARCH} == "sparc") || \
-	(${MACHINE_ARCH} == "vax")
-.if defined(USE_EGCS)
-	(cd ${.CURDIR}/gnu/usr.bin/egcs/libgcc &&\
-	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
-.else
-	(cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc &&\
-	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
-.endif # USE_EGCS
-.endif # MACHINE_ARCH
-	(cd ${.CURDIR}/usr.bin/lex &&\
-	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/usr.bin/yacc && \
-	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/usr.bin/xlint && \
-	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && ${MAKE} depend && ${MAKE} && ${MAKE} install)
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
 # libtelnet depends on libdes and libkrb.  libkrb depends on
 # libcom_err.
@@ -106,6 +76,17 @@ build: beforeinstall
 	    ${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/usr.bin/egcs/libgcc &&\
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+.endif # DESTDIR && !HAVE_GCC28
+.endif # USE_EGCS
 	@echo -n "Build finished at: "
 	@date