diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-11-16 21:53:13 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-11-16 21:53:13 +0000 |
| commit | 6e21d0e99052f9aa63f868f8cca92af2bf9df8c4 (patch) | |
| tree | b7b65b9b90c06fd1540ea0674cd3917b57a5117d | |
| parent | 323b04aa2a18a840696e1f531c46df669f2a979a (diff) | |
Fix more libss stuff.
| -rw-r--r-- | include/Makefile | 4 | ||||
| -rw-r--r-- | kerberosIV/include/Makefile | 4 | ||||
| -rw-r--r-- | kerberosIV/include/ss/Makefile | 15 | ||||
| -rw-r--r-- | lib/libss/Makefile | 20 | ||||
| -rw-r--r-- | lib/libss/ss.h (renamed from kerberosIV/include/ss/ss.h) | 2 |
5 files changed, 15 insertions, 30 deletions
diff --git a/include/Makefile b/include/Makefile index 2cc2ebfcf7a..13efc7a5c48 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 1996/11/15 09:25:19 downsj Exp $ +# $OpenBSD: Makefile,v 1.31 1996/11/16 21:53:10 downsj Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -44,7 +44,7 @@ NOOBJ= noobj .include <bsd.own.mk> SYS_INCLUDE?= copies .if defined(KERBEROS) -RDIRS+= ../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb ../kerberosIV/ss +RDIRS+= ../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb .endif includes: diff --git a/kerberosIV/include/Makefile b/kerberosIV/include/Makefile index 0edee405865..6f9af9462f2 100644 --- a/kerberosIV/include/Makefile +++ b/kerberosIV/include/Makefile @@ -1,5 +1,5 @@ -# $Id: Makefile,v 1.1 1995/12/14 06:52:34 tholo Exp $ +# $Id: Makefile,v 1.2 1996/11/16 21:52:36 downsj Exp $ -SUBDIR= kerberosIV ss +SUBDIR= kerberosIV .include <bsd.subdir.mk> diff --git a/kerberosIV/include/ss/Makefile b/kerberosIV/include/ss/Makefile deleted file mode 100644 index 16b8d24aed2..00000000000 --- a/kerberosIV/include/ss/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $Id: Makefile,v 1.3 1996/07/31 18:27:35 deraadt Exp $ - -FILES= ss.h -NOOBJ= noobj - -all include clean cleandir depend lint tags: - -includes: - @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 - -.include <bsd.prog.mk> diff --git a/lib/libss/Makefile b/lib/libss/Makefile index 8af91083a49..69af3eb9695 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 1996/11/15 09:25:23 downsj Exp $ +# $OpenBSD: Makefile,v 1.2 1996/11/16 21:53:11 downsj Exp $ LIB= ss +HDRS= ss.h ss_err.h SRCS= ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \ listen.c pager.c parse.c prompt.c request_tbl.c requests.c \ std_rqs.c @@ -18,15 +19,14 @@ std_rqs.c: ${.CURDIR}/std_rqs.ct mk_cmds std_rqs.ct -test -h std_rqs.ct && rm std_rqs.ct -includes: ss_err.h - -cd ${.OBJDIR}; \ - if [ -f ss_err.h ]; then \ - cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \ - install -c -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \ - ${DESTDIR}/usr/include/ss; \ - else \ - true; \ - fi +includes: + @cd ${.CURDIR}; for i in $(HDRS); do \ + j="cmp -s $$i ${DESTDIR}/usr/include/ss/$$i || \ + install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \ + ${DESTDIR}/usr/include/ss"; \ + echo $$j; \ + eval "$$j"; \ + done beforedepend: test -h ss || ln -s . ss diff --git a/kerberosIV/include/ss/ss.h b/lib/libss/ss.h index 97521c9c1c8..0afcef2e83e 100644 --- a/kerberosIV/include/ss/ss.h +++ b/lib/libss/ss.h @@ -1,4 +1,4 @@ -/* $Id: ss.h,v 1.1 1995/12/14 06:52:35 tholo Exp $ */ +/* $OpenBSD: ss.h,v 1.1 1996/11/16 21:53:12 downsj Exp $ */ /*- * Copyright 1987, 1988 by the Student Information Processing Board |