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.21
retrieving revision 1.61
diff -u -p -r1.21 -r1.61
--- src/Makefile	1995/02/19 12:20:06	1.21
+++ src/Makefile	1998/07/26 17:28:58	1.61
@@ -1,11 +1,20 @@
-#	$Id: Makefile,v 1.21 1995/02/19 12:20:06 cgd Exp $
+#	$NetBSD: Makefile,v 1.61 1998/07/26 17:28:58 mycroft 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 games
-SUBDIR+= gnu
+SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
+
+.if exists(games)
+SUBDIR+= games
+.endif
 
-SUBDIR+= sys
+SUBDIR+= gnu
+# This is needed for libstdc++ and gen-params.
+includes-gnu: includes-include includes-sys
 
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
 SUBDIR+= domestic
@@ -18,27 +27,65 @@ SUBDIR+= regress
 
 regression-tests:
 	@echo Running regression tests...
-	@(cd regress && ${MAKE} regress)
+	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.include <bsd.own.mk>	# for NOMAN, if it's there.
+beforeinstall:
+.ifmake build
+	@echo -n "Build started at: "
+	@date
+.endif
+.ifndef DESTDIR
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+.else
+	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
+.endif
 
 afterinstall:
 .ifndef NOMAN
-	(cd share/man && ${MAKE} makedb)
+	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
-build:
-	(cd include && ${MAKE} install)
+build: beforeinstall
+	(cd ${.CURDIR}/share/mk && ${MAKE} install)
+	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
+.if !defined(UPDATE)
 	${MAKE} cleandir
-	(cd lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-.if exists(domestic)
-	(cd domestic/libcrypt && ${MAKE} depend && ${MAKE} && ${MAKE} install)
 .endif
-.if exists(kerberosIV)
-	(cd kerberosIV && ${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/usr.bin/egcs/libgcc && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.else
+	(cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \
+	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+.endif
+.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
+# 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
+	@echo -n "Build finished at: "
+	@date
 
 .include <bsd.subdir.mk>