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.24 retrieving revision 1.34 diff -u -p -r1.24 -r1.34 --- src/Makefile 1995/10/07 22:58:52 1.24 +++ src/Makefile 1996/04/25 01:02:27 1.34 @@ -1,4 +1,6 @@ -# $Id: Makefile,v 1.24 1995/10/07 22:58:52 pk Exp $ +# $NetBSD: Makefile,v 1.34 1996/04/25 01:02:27 jtc Exp $ + +.include # for configuration variables. # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW @@ -21,10 +23,12 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif -.include # for NOMAN, if it's there. - -#beforeinstall: -# (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) +beforeinstall: +.ifndef DESTDIR + (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) +.else + (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs) +.endif afterinstall: .ifndef NOMAN @@ -32,15 +36,18 @@ afterinstall: .endif build: - (cd ${.CURDIR}/include && ${MAKE} install) + (cd ${.CURDIR}/share/mk && ${MAKE} install) + ${MAKE} includes +.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/libcrypt && ${MAKE} depend && ${MAKE} && ${MAKE} install) -.endif -.if exists(kerberosIV) - (cd ${.CURDIR}/kerberosIV && ${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 ${MAKE} depend && ${MAKE} && ${MAKE} install