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.27 retrieving revision 1.33 diff -u -p -r1.27 -r1.33 --- src/Makefile 1995/12/09 23:07:02 1.27 +++ src/Makefile 1996/04/25 00:47:25 1.33 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.27 1995/12/09 23:07:02 tls Exp $ +# $NetBSD: Makefile,v 1.33 1996/04/25 00:47:25 jtc Exp $ + +.include # for configuration variables. # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW @@ -21,11 +23,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,19 +36,20 @@ afterinstall: .endif build: -.if exists(domestic) - {cd ${.CURDIR}/domestic/include && ${MAKE} install) -.endif + (cd ${.CURDIR}/share/mk && ${MAKE} install) + ${MAKE} includes (cd ${.CURDIR}/include && ${MAKE} install) +.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) + (cd ${.CURDIR}/domestic/include && ${MAKE} install) +.endif ${MAKE} cleandir (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) + # XXX should do the whole of domestic/lib + (cd ${.CURDIR}/domestic/lib/libcrypt && ${MAKE} depend && ${MAKE} && \ + ${MAKE} install) .endif -#.if exists(kerberosIV) -# (cd ${.CURDIR}/kerberosIV && ${MAKE} depend && ${MAKE} && ${MAKE} install) -#.endif ${MAKE} depend && ${MAKE} && ${MAKE} install .include