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 retrieving revision 1.78 retrieving revision 1.79 diff -u -p -r1.78 -r1.79 --- src/Makefile 1999/01/05 07:09:58 1.78 +++ src/Makefile 1999/01/24 07:42:34 1.79 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 1999/01/05 07:09:58 scottr Exp $ +# $NetBSD: Makefile,v 1.79 1999/01/24 07:42:34 scottr Exp $ .include # for configuration variables. @@ -30,7 +30,11 @@ SUBDIR+= gnu # This is needed for libstdc++ and gen-params. includes-gnu: includes-include includes-sys -.if exists(domestic) && (make(clean) || make(cleandir) || make(obj)) +# This little mess makes the includes and install targets +# do the expected thing. +.if exists(domestic) && \ + (make(clean) || make(cleandir) || make(obj) || \ + (!defined(EXPORTABLE_SYSTEM) && (make(includes) || make(install)))) SUBDIR+= domestic .endif @@ -80,14 +84,14 @@ build: beforeinstall ${MAKE} NOMAN= install && ${MAKE} cleandir) .endif .endif - ${MAKE} includes + ${MAKE} EXPORTABLE_SYSTEM= includes (cd ${.CURDIR}/lib/csu && \ ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) (cd ${.CURDIR}/lib && \ ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) (cd ${.CURDIR}/gnu/lib && \ ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) - ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} install + ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} EXPORTABLE_SYSTEM= install .if exists(domestic) && !defined(EXPORTABLE_SYSTEM) (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build) .endif