diff options
| -rw-r--r-- | kerberosIV/Makefile | 13 | ||||
| -rw-r--r-- | kerberosIV/include/kerberosIV/Makefile | 8 | ||||
| -rw-r--r-- | kerberosIV/include/ss/Makefile | 8 | ||||
| -rw-r--r-- | kerberosIV/kadm/Makefile | 4 | ||||
| -rw-r--r-- | kerberosIV/krb/Makefile | 2 | ||||
| -rw-r--r-- | kerberosIV/ss/Makefile | 4 |
6 files changed, 19 insertions, 20 deletions
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile index 1f803df98d3..2cb6c91f8ba 100644 --- a/kerberosIV/Makefile +++ b/kerberosIV/Makefile @@ -1,14 +1,16 @@ -# $OpenBSD: Makefile,v 1.3 1996/05/15 08:51:59 niklas Exp $ +# $OpenBSD: Makefile,v 1.4 1996/06/02 07:21:30 tholo Exp $ # from @(#)Makefile 5.1 (Berkeley) 6/25/90 # do compile_et and mk_cmds first, used by other directories -.ifmake install -SUBDIR= include -.else +.ifnmake install SUBDIR= compile_et mk_cmds .endif +.ifmake includes +SUBDIR+=include +.endif + SUBDIR+=acl com_err des krb kadm kafs kdb ss SUBDIR+=ext_srvtab kadmin kadmind kdb_destroy kdb_edit kdb_init kdb_util \ @@ -18,8 +20,9 @@ SUBDIR+=ext_srvtab kadmin kadmind kdb_destroy kdb_edit kdb_init kdb_util \ SUBDIR+=man build: - (cd ${.CURDIR}/include && ${MAKE} install) + (cd ${.CURDIR}/include && ${MAKE} includes) ${MAKE} cleandir + ${MAKE} includes (cd ${.CURDIR}/compile_et && ${MAKE} depend && ${MAKE}) (cd ${.CURDIR}/mk_cmds && ${MAKE} depend && ${MAKE}) (cd ${.CURDIR}/acl && ${MAKE} depend && ${MAKE} && ${MAKE} install) diff --git a/kerberosIV/include/kerberosIV/Makefile b/kerberosIV/include/kerberosIV/Makefile index bd92b887730..0ecc9091292 100644 --- a/kerberosIV/include/kerberosIV/Makefile +++ b/kerberosIV/include/kerberosIV/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1996/02/10 21:04:43 tholo Exp $ +# $Id: Makefile,v 1.3 1996/06/02 07:21:31 tholo Exp $ FILES= acl.h com_err.h des.h kadm.h kafs.h kparse.h krb.h krb_db.h \ site.h @@ -6,14 +6,12 @@ NOOBJ= noobj all include clean cleandir depend lint tags: -realinstall: +includes: + install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/kerberosIV @echo installing ${FILES} @-for i in ${FILES}; do \ cmp -s $$i ${DESTDIR}/usr/include/kerberosIV/$$i || \ install -c -m 444 $$i ${DESTDIR}/usr/include/kerberosIV/$$i; \ done -beforeinstall: - install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/kerberosIV - .include <bsd.prog.mk> diff --git a/kerberosIV/include/ss/Makefile b/kerberosIV/include/ss/Makefile index 73708779445..f95a4d3d311 100644 --- a/kerberosIV/include/ss/Makefile +++ b/kerberosIV/include/ss/Makefile @@ -1,18 +1,16 @@ -# $Id: Makefile,v 1.1 1995/12/14 06:52:35 tholo Exp $ +# $Id: Makefile,v 1.2 1996/06/02 07:21:31 tholo Exp $ FILES= ss.h NOOBJ= noobj all include clean cleandir depend lint tags: -realinstall: +includes: + install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ss @echo installing ${FILES} @-for i in ${FILES}; do \ cmp -s $$i ${DESTDIR}/usr/include/ss/$$i || \ install -c -m 444 $$i ${DESTDIR}/usr/include/ss/$$i; \ done -beforeinstall: - install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ss - .include <bsd.prog.mk> diff --git a/kerberosIV/kadm/Makefile b/kerberosIV/kadm/Makefile index 04aed4e8afb..9a0477155e0 100644 --- a/kerberosIV/kadm/Makefile +++ b/kerberosIV/kadm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/12/14 06:52:45 tholo Exp $ +# $Id: Makefile,v 1.2 1996/06/02 07:21:32 tholo Exp $ LIB= kadm SRCS= kadm_err.c kadm_cli_wrap.c kadm_stream.c kadm_supp.c @@ -16,7 +16,7 @@ kadm_err.c kadm_err.h: kadm_err.et ${COMPILE_ET} kadm_err.et -test -h kadm_err.et && rm kadm_err.et -beforeinstall: +includes: kadm_err.h -cd ${.OBJDIR}; cmp -s kadm_err.h ${DESTDIR}/usr/include/kerberosIV/kadm_err.h || \ install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm_err.h ${DESTDIR}/usr/include/kerberosIV diff --git a/kerberosIV/krb/Makefile b/kerberosIV/krb/Makefile index 260bc68c811..95cb9387ab6 100644 --- a/kerberosIV/krb/Makefile +++ b/kerberosIV/krb/Makefile @@ -35,7 +35,7 @@ krb_err.c krb_err.h: krb_err.et ${COMPILE_ET} krb_err.et -test -h krb_err.et && rm krb_err.et -beforeinstall: +includes: krb_err.h -cd ${.OBJDIR}; cmp -s krb_err.h ${DESTDIR}/usr/include/kerberosIV/krb_err.h || \ install -c -o ${BINOWN} -g ${BINGRP} -m 444 krb_err.h ${DESTDIR}/usr/include/kerberosIV diff --git a/kerberosIV/ss/Makefile b/kerberosIV/ss/Makefile index 0866f41e542..acc299027d1 100644 --- a/kerberosIV/ss/Makefile +++ b/kerberosIV/ss/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/12/17 18:20:20 tholo Exp $ +# $Id: Makefile,v 1.3 1996/06/02 07:21:33 tholo Exp $ LIB= ss SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ @@ -18,7 +18,7 @@ std_rqs.c: ${.CURDIR}/std_rqs.ct ${MK_CMDS} std_rqs.ct -test -h std_rqs.ct && rm std_rqs.ct -beforeinstall: +includes: ss_err.h -cd ${.OBJDIR}; \ if [ -f ss_err.h ]; then \ cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \ |