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.35
retrieving revision 1.41
diff -u -p -r1.35 -r1.41
--- src/Makefile	1996/04/25 01:09:33	1.35
+++ src/Makefile	1997/05/29 14:23:02	1.41
@@ -1,10 +1,15 @@
-#	$NetBSD: Makefile,v 1.35 1996/04/25 01:09:33 jtc Exp $
+#	$NetBSD: Makefile,v 1.41 1997/05/29 14:23:02 cjs Exp $
 
 .include <bsd.own.mk>			# for configuration variables.
 
 # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
 
-SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share games
+SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share
+
+.if exists(games)
+SUBDIR+= games
+.endif
+
 SUBDIR+= gnu
 
 SUBDIR+= sys
@@ -35,17 +40,34 @@ afterinstall:
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
-build:
+oldbuild:
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
 	${MAKE} includes
+.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)
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	# XXX should do the whole of domestic/lib
-	(cd ${.CURDIR}/domestic/lib/libcrypt && ${MAKE} depend && ${MAKE} && \
+	(cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \
 	    ${MAKE} install)
 .endif
 	${MAKE} depend && ${MAKE} && ${MAKE} install
 
+build:
+	@# can't do domestic includes until crt0.o, etc. is built.
+	${MAKE} EXPORTABLE_SYSTEM=1 includes
+.if !defined(UPDATE)
+	${MAKE} cleandir
+.endif
+	(cd ${.CURDIR}/lib/csu && ${MAKE} depend && ${MAKE})
+	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE})
+	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE})
+.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
+	(cd ${.CURDIR}/domestic && ${MAKE} includes)
+	(cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE})
+.endif
+	${MAKE} depend && ${MAKE}
+
 .include <bsd.subdir.mk>