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.29 retrieving revision 1.42 diff -u -p -r1.29 -r1.42 --- src/Makefile 1996/03/18 09:21:33 1.29 +++ src/Makefile 1997/05/31 21:21:13 1.42 @@ -1,8 +1,15 @@ -# $NetBSD: Makefile,v 1.29 1996/03/18 09:21:33 tls Exp $ +# $NetBSD: Makefile,v 1.42 1997/05/31 21:21:13 cjs Exp $ + +.include # 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 @@ -21,11 +28,11 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif -.include # for NOMAN, if it's there. - beforeinstall: .ifndef DESTDIR (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) +.else + (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs) .endif afterinstall: @@ -34,15 +41,17 @@ afterinstall: .endif build: -.if exists(domestic) - (cd ${.CURDIR}/domestic/include && ${MAKE} install) -.endif - (cd ${.CURDIR}/include && ${MAKE} install) + (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) - (cd ${.CURDIR}/domestic/lib/libcrypt && ${MAKE} depend && ${MAKE} && ${MAKE} install) +.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) + (cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \ + ${MAKE} install) .endif ${MAKE} depend && ${MAKE} && ${MAKE} install