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.81
retrieving revision 1.85
diff -u -p -r1.81 -r1.85
--- src/Makefile	1999/01/28 15:36:48	1.81
+++ src/Makefile	1999/02/11 17:56:46	1.85
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.81 1999/01/28 15:36:48 scottr Exp $
+#	$NetBSD: Makefile,v 1.85 1999/02/11 17:56:46 tv Exp $
 
 .include <bsd.own.mk>			# for configuration variables.
 
@@ -30,11 +30,16 @@ SUBDIR+= gnu
 # This is needed for libstdc++ and gen-params.
 includes-gnu: includes-include includes-sys
 
-# This little mess makes the includes and install targets
-# do the expected thing.
+# Descend into the domestic tree if it exists AND
+#  1) the target is clean, cleandir, or obj, OR
+#  2) the the target is install or includes AND NOT
+#    a) compiling only "exportable" code OR
+#    b) doing it as part of build.
+
 .if exists(domestic) && \
     (make(clean) || make(cleandir) || make(obj) || \
-    (!defined(_BUILD) && (make(includes) || make(install))))
+    ((make(includes) || make(install)) && \
+    !(defined(EXPORTABLE_SYSTEM) || defined(_BUILD))))
 SUBDIR+= domestic
 .endif
 
@@ -67,6 +72,9 @@ afterinstall:
 whatis.db:
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 
+# wrt info/dir below:  It's safe to move this over top of /usr/share/info/dir,
+# as the build will automatically remove/replace the non-pkg entries there.
+
 build: beforeinstall
 .if !defined(NOSHARE)
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
@@ -78,9 +86,9 @@ build: beforeinstall
 .if empty(HAVE_GCC28)
 .if defined(DESTDIR)
 	@echo "*** CAPUTE!"
-	@echo "    You attempted to compile the world with egcs.  You must"
+	@echo "    You attempted to compile the world without egcs.  You must"
 	@echo "    first install a native egcs compiler."
-	false
+	@false
 .else
 	(cd ${.CURDIR}/gnu/usr.bin/egcs && \
 	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \
@@ -94,6 +102,10 @@ build: beforeinstall
 	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
 	(cd ${.CURDIR}/gnu/lib && \
 	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
+.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
+	(cd ${.CURDIR}/domestic/lib && \
+	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
+.endif
 	${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
 	(cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)