From: mickey Date: Tue, 23 Apr 1996 09:47:22 +0000 (+0000) Subject: sync w/ NetBSD 960418. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=094eb183405ac5982f824e091cad873e1bb90e9a;p=openbsd sync w/ NetBSD 960418. --- diff --git a/Makefile b/Makefile index 2924854eba0..fbc20be88c3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ +# $OpenBSD: Makefile,v 1.6 1996/04/23 09:47:22 mickey Exp $ # $NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $ +.include # for NOMAN, if it's there. + # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share games @@ -7,8 +10,6 @@ SUBDIR+= gnu SUBDIR+= sys lkm -.include # for NOMAN, if it's there. - .if defined(KERBEROS) SUBDIR+= kerberosIV .endif @@ -24,7 +25,11 @@ regression-tests: .endif #beforeinstall: +#.ifndef DESTDIR # (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) +#.else +# (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs) +#.endif afterinstall: .ifndef NOMAN @@ -32,7 +37,11 @@ afterinstall: .endif build: + (cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/include && ${MAKE} install) +.if defined(KERBEROS) + (cd ${.CURDIR}/kerberosIV/include && ${MAKE} install) +.endif ${MAKE} cleandir (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)