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.63
retrieving revision 1.68
diff -u -p -r1.63 -r1.68
--- src/Makefile	1998/08/16 17:25:30	1.63
+++ src/Makefile	1998/09/29 06:59:53	1.68
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.63 1998/08/16 17:25:30 tv Exp $
+#	$NetBSD: Makefile,v 1.68 1998/09/29 06:59:53 lukem Exp $
 
 .include <bsd.own.mk>			# for configuration variables.
 
@@ -42,13 +42,15 @@ beforeinstall:
 .endif
 
 afterinstall:
-.ifndef NOMAN
+.if !defined(NOMAN) && !defined(NOSHARE)
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
 build: beforeinstall
+.if !defined(NOSHARE)
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
 	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
+.endif
 .if !defined(UPDATE)
 	${MAKE} cleandir
 .endif
@@ -59,12 +61,11 @@ build: beforeinstall
 	    ${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/usr.bin/egcs/libgcc && \
-#	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.if defined(USE_EGCS) && !empty(HAVE_GCC28)
+	(cd ${.CURDIR}/gnu/lib/libgcc && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
 .else
-.if	(${MACHINE_ARCH} != "alpha") && \
-	(${MACHINE_ARCH} != "powerpc")
+.if	(${MACHINE_ARCH} != "powerpc")
 	(cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \
 	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
 .endif
@@ -88,6 +89,17 @@ build: beforeinstall
 	    ${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