From e7ade285301ad04974ece3655612432da8cb43d3 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Sun, 12 Nov 1995 08:13:23 +0000 Subject: [PATCH] Bring Jordan's 2.1 dependancy fixes into current. Incorporate some dependancy fixes from John Hay Submitted by: jkh, John Hay --- eBones/lib/libkadm/Makefile | 4 ++-- eBones/lib/libkrb/Makefile | 4 ++-- eBones/libexec/kpropd/Makefile | 4 ++-- eBones/libexec/registerd/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile index dc822b38fb1a..955cc2ae40c1 100644 --- a/eBones/lib/libkadm/Makefile +++ b/eBones/lib/libkadm/Makefile @@ -1,12 +1,12 @@ # From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.7 1995/09/14 19:52:28 gibbs Exp $ +# $Id: Makefile,v 1.8 1995/09/15 06:20:23 gibbs Exp $ LIB= kadm SRCS= kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c CFLAGS+= -I. -I${.CURDIR} -I${KRBOBJDIR} -DPOSIX -beforeinstall: +beforeinstall: kadm_err.c -cd ${.CURDIR}; cmp -s kadm.h \ ${DESTDIR}/usr/include/kerberosIV/kadm.h || \ install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm.h \ diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile index 05e44d2cf956..02aecaf6dac9 100644 --- a/eBones/lib/libkrb/Makefile +++ b/eBones/lib/libkrb/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.10 1995/10/05 21:29:41 gibbs Exp $ +# $Id: Makefile,v 1.11 1995/10/06 17:37:54 gibbs Exp $ LIB= krb SHLIB_MINOR= 1 @@ -20,7 +20,7 @@ SRCS= krb_err.c create_auth_reply.c create_ciph.c \ LDADD+= -lcom_err -beforeinstall: +beforeinstall: krb_err.c -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 \ diff --git a/eBones/libexec/kpropd/Makefile b/eBones/libexec/kpropd/Makefile index 0f1f420eda8b..4368dc084423 100644 --- a/eBones/libexec/kpropd/Makefile +++ b/eBones/libexec/kpropd/Makefile @@ -1,10 +1,10 @@ # From: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.4 1995/09/13 17:24:02 markm Exp $ +# $Id: Makefile,v 1.5 1995/09/14 04:05:12 gibbs Exp $ PROG= kpropd CFLAGS+=-I${.CURDIR}/../../usr.sbin/kprop DPADD+= ${LIBKRB} ${LIBDES} -LDADD= -lkrb -ldes +LDADD= -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes NOMAN= noman .include diff --git a/eBones/libexec/registerd/Makefile b/eBones/libexec/registerd/Makefile index af9e2cab5ef7..1afe721205b2 100644 --- a/eBones/libexec/registerd/Makefile +++ b/eBones/libexec/registerd/Makefile @@ -6,13 +6,13 @@ # # @(#)Makefile 8.1 (Berkeley) 6/1/93 # -# $Id: Makefile,v 1.4 1995/09/13 17:24:03 markm Exp $ +# $Id: Makefile,v 1.5 1995/09/14 04:05:16 gibbs Exp $ PROG= registerd SRCS= registerd.c CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/register DPADD+= ${LIBKDB} ${LIBKRB} ${LIBDES} -LDADD= -lkdb -lkrb -ldes +LDADD= -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes MAN8= registerd.8 .include