40 files changed, 168 insertions, 146 deletions

diff --git a/eBones/Makefile b/eBones/Makefile
index 28f92b6cc590..8b0b6187903c 100644
--- a/eBones/Makefile
+++ b/eBones/Makefile
@@ -1,13 +1,7 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.14 1995/07/18 16:34:20 mark Exp $
+#	$Id$
 
-SUBDIR=	include des acl kdb krb libkadm
-
-SUBDIR+= ext_srvtab kdb_destroy kdb_edit \
-	 kdb_init kdb_util kdestroy kerberos kinit klist ksrvtgt \
-	 kstash kadmin kadmind ksrvutil man register registerd make_keypair
-
-CFLAGS+= -Wall
+SUBDIR=	des include lib libexec usr.bin usr.sbin
 
 SDIR= ${.CURDIR}/..
 
@@ -37,10 +31,6 @@ bootstrap:
 	( cd des; ${MAKE} ${MFLAGS} depend all install )
 	${MAKE} ${MFLAGS} cleandir
 	${MAKE} ${MFLAGS} obj
-	@echo removing old 1.1.5 Kerberos libraries
-	rm -f /usr/lib/libkrb.so.4.0
-	rm -f /usr/lib/libdes.so.4.0
-	rm -f /usr/lib/libkdb.so.4.0
 	${MAKE} ${MFLAGS} depend all install kprog
 
 help-distribute:	distribute
@@ -56,4 +46,3 @@ help-distribute:	distribute
 	cd ${SDIR}/usr.bin/su; ${CODAD}
 
 .include <bsd.subdir.mk>
-
diff --git a/eBones/include/Makefile b/eBones/include/Makefile
index 7e29c67327b2..12d819893337 100644
--- a/eBones/include/Makefile
+++ b/eBones/include/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/07/18 16:36:00 mark Exp $
+#	$Id: Makefile,v 1.5 1995/08/25 21:25:09 mark Exp $
 
 FILES=	kparse.h krb.h krb_db.h
 
diff --git a/eBones/include/kparse.h b/eBones/include/kparse.h
index 58d45a7387be..d506d9dc3b31 100644
--- a/eBones/include/kparse.h
+++ b/eBones/include/kparse.h
@@ -6,7 +6,7 @@
  * Include file for kparse routines.
  *
  *	from: kparse.h,v 4.5 89/01/11 12:05:53 steiner Exp $
- *	$Id: kparse.h,v 1.3 1995/07/18 16:36:32 mark Exp $
+ *	$Id: kparse.h,v 1.4 1995/09/07 20:50:34 mark Exp $
  */
 
 #ifndef KPARSE_DEFS
diff --git a/eBones/include/krb.h b/eBones/include/krb.h
index 70c2a80fff10..0b1ae090a2ab 100644
--- a/eBones/include/krb.h
+++ b/eBones/include/krb.h
@@ -6,7 +6,7 @@
  * Include file for the Kerberos library.
  *
  *	from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $
- *	$Id: krb.h,v 1.6 1995/08/25 21:25:10 mark Exp $
+ *	$Id: krb.h,v 1.7 1995/09/07 20:50:36 mark Exp $
  */
 
 /* Only one time, please */
diff --git a/eBones/lib/Makefile b/eBones/lib/Makefile
new file mode 100644
index 000000000000..37f0442a8c3a
--- /dev/null
+++ b/eBones/lib/Makefile
@@ -0,0 +1,6 @@
+#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
+#	$Id$
+
+SUBDIR=	libacl libkadm libkdb libkrb
+
+.include <bsd.subdir.mk>
diff --git a/eBones/lib/libacl/Makefile b/eBones/lib/libacl/Makefile
index c015eaa1cb37..3eefb2f83e23 100644
--- a/eBones/lib/libacl/Makefile
+++ b/eBones/lib/libacl/Makefile
@@ -1,10 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/07/18 16:34:47 mark Exp $
+#	$Id$
 
 LIB=	acl
-SHLIB_MAJOR= 2
-SHLIB_MINOR= 0
-CFLAGS+=-DDEBUG -DKERBEROS -I${.CURDIR}/../include -Wall
+CFLAGS+=-DDEBUG -DKERBEROS -I${.CURDIR}/../../include -Wall
 SRCS=	acl_files.c
 MAN3=	acl_check.3
 MLINKS=	acl_check.3 acl_canonicalize_principal.3 \
diff --git a/eBones/lib/libacl/acl_files.c b/eBones/lib/libacl/acl_files.c
index a3e1f68d8fac..7670f2aa22aa 100644
--- a/eBones/lib/libacl/acl_files.c
+++ b/eBones/lib/libacl/acl_files.c
@@ -6,13 +6,13 @@
  * <mit-copyright.h>.
  *
  *	from: acl_files.c,v 4.4 89/12/19 13:30:53 jtkohl Exp $
- *	$Id: acl_files.c,v 1.3 1995/07/18 16:34:49 mark Exp $
+ *	$Id: acl_files.c,v 1.5 1995/09/07 20:50:26 mark Exp $
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$Id: acl_files.c,v 1.3 1995/07/18 16:34:49 mark Exp $";
+"$Id: acl_files.c,v 1.5 1995/09/07 20:50:26 mark Exp $";
 #endif lint
 #endif
 
diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile
index 293e84280237..45e6d04a66fe 100644
--- a/eBones/lib/libkadm/Makefile
+++ b/eBones/lib/libkadm/Makefile
@@ -1,16 +1,20 @@
-#	$Id: Makefile,v 1.1 1995/07/18 16:40:20 mark Exp $
+#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
+#	$Id$
 
 LIB=	kadm
 
-SRCS=	kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c
-CFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}/../include -I${KRBOBJDIR} \
-		-DPOSIX -Wall
-CLEANFILES+=	kadm_err.c kadm_err.h
+SRCS=	kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c krb_err.h
+CFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}/../../include -DPOSIX -Wall
+CLEANFILES+=	kadm_err.c kadm_err.h krb_err.c krb_err.h
 
 kadm_err.c kadm_err.h:	kadm_err.et
 	test -e kadm_err.et || ln -s ${.CURDIR}/kadm_err.et .
 	compile_et kadm_err.et
 
+krb_err.h:
+	test -e krb_err.et || ln -s ${.CURDIR}/../libkrb/krb_err.et .
+	compile_et krb_err.et
+
 beforeinstall:
 	-cd ${.CURDIR}; cmp -s kadm.h \
 	    ${DESTDIR}/usr/include/kerberosIV/kadm.h || \
diff --git a/eBones/lib/libkdb/Makefile b/eBones/lib/libkdb/Makefile
index 42f423572573..b2b3314529ff 100644
--- a/eBones/lib/libkdb/Makefile
+++ b/eBones/lib/libkdb/Makefile
@@ -1,11 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/07/18 16:37:10 mark Exp $
-
-SHLIB_MAJOR= 2
-SHLIB_MINOR= 0
+#	$Id$
 
 LIB=	kdb
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
 SRCS=	krb_cache.c krb_dbm.c krb_kdb_utils.c krb_lib.c print_princ.c
 
 .include <bsd.lib.mk>
diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile
index b09b96b233a6..82d6a1ce3a88 100644
--- a/eBones/lib/libkrb/Makefile
+++ b/eBones/lib/libkrb/Makefile
@@ -1,10 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.5 1995/07/18 16:38:02 mark Exp $
+#	$Id$
 
 LIB=	krb
-SHLIB_MAJOR= 2
-SHLIB_MINOR= 0
-CFLAGS+=-DKERBEROS -DCRYPT -DDEBUG -I${.CURDIR}/../include -DBSD42 -Wall
+CFLAGS+=-DKERBEROS -DCRYPT -DDEBUG -I${.CURDIR}/../../include -DBSD42 -Wall
 SRCS=	krb_err.c create_auth_reply.c create_ciph.c \
 	create_death_packet.c create_ticket.c debug_decl.c decomp_ticket.c \
 	des_rw.c dest_tkt.c extract_ticket.c fgetst.c get_ad_tkt.c \
@@ -19,10 +17,10 @@ SRCS=	krb_err.c create_auth_reply.c create_ciph.c \
 	save_credentials.c send_to_kdc.c sendauth.c stime.c tf_util.c \
 	tkt_string.c util.c
 
-TDIR=	${.CURDIR}/..
 krb_err.c krb_err.h: krb_err.et
 	test -e krb_err.et || ln -s ${.CURDIR}/krb_err.et .
-	${COMPILE_ET} krb_err.et
+	compile_et krb_err.et
+
 LDADD+=	-lcom_err
 
 beforeinstall:
diff --git a/eBones/lib/libkrb/krb.3 b/eBones/lib/libkrb/krb.3
index 98a720b820b2..10e20e948077 100644
--- a/eBones/lib/libkrb/krb.3
+++ b/eBones/lib/libkrb/krb.3
@@ -1,6 +1,6 @@
-.\" $Source: /home/ncvs/src/eBones/man/krb.3,v $
-.\" $Author: rgrimes $
-.\" $Header: /home/ncvs/src/eBones/man/krb.3,v 1.1.1.1 1994/05/27 05:12:09 rgrimes Exp $
+.\" $Source: /usr/cvs/src/eBones/krb/krb.3,v $
+.\" $Author: mark $
+.\" $Header: /usr/cvs/src/eBones/krb/krb.3,v 1.2 1995/07/18 16:40:57 mark Exp $
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
@@ -15,7 +15,7 @@ krb_rd_err, krb_ck_repl \- Kerberos authentication library
 .nf
 .nj
 .ft B
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 .PP
 .ft B
@@ -436,7 +436,7 @@ filled in with data obtained from Kerberos.
 .br
 /usr/lib/libkrb.a
 .br
-/usr/include/kerberosIV/des.h
+/usr/include/des.h
 .br
 /usr/lib/libdes.a
 .br
diff --git a/eBones/lib/libkrb/krb_realmofhost.3 b/eBones/lib/libkrb/krb_realmofhost.3
index 63aa1eb7da57..c3b14cc45788 100644
--- a/eBones/lib/libkrb/krb_realmofhost.3
+++ b/eBones/lib/libkrb/krb_realmofhost.3
@@ -1,5 +1,5 @@
 .\" from: krb_realmofhost.3,v 4.1 89/01/23 11:10:47 jtkohl Exp $
-.\" $Id: krb_realmofhost.3,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $
+.\" $Id: krb_realmofhost.3,v 1.3 1995/07/18 16:41:02 mark Exp $
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
@@ -14,7 +14,7 @@ krb_get_lrealm \- additional Kerberos utility routines
 .nj
 .ft B
 #include <kerberosIV/krb.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <netinet/in.h>
 .PP
 .ft B
@@ -52,11 +52,11 @@ as determined by the translation table
 .I host
 should be the fully-qualified domain-style primary host name of the host
 in question.  In order to prevent certain security attacks, this routine
-must either have 
+must either have
 .I a priori
 knowledge of a host's realm, or obtain such information securely.
 .PP
-The format of the translation file is described by 
+The format of the translation file is described by
 .IR krb.realms (5).
 If
 .I host
@@ -71,10 +71,10 @@ If
 contains a domain, but no translation is found,
 .IR host 's
 domain is converted to upper-case and returned.
-If 
+If
 .I host
 contains no discernable domain, or an error occurs,
-the local realm name, as supplied by 
+the local realm name, as supplied by
 .IR krb_get_lrealm (3),
 is returned.
 .PP
@@ -97,7 +97,7 @@ host running a Kerberos key distribution center (KDC)
 for realm
 .IR realm ,
 as specified in the configuration file (\fI/etc/kerberosIV/krb.conf\fR).
-The configuration file is described by 
+The configuration file is described by
 .IR krb.conf (5).
 If the host is successfully filled in, the routine
 returns KSUCCESS.
@@ -155,7 +155,7 @@ The current convention for instance names is too limited; the full
 domain name should be used.
 .PP
 .I krb_get_lrealm
-currently only supports 
+currently only supports
 .I n
 = 1.  It should really consult the user's ticket cache to determine the
 user's current realm, rather than consulting a file on the host.
diff --git a/eBones/lib/libkrb/krb_sendauth.3 b/eBones/lib/libkrb/krb_sendauth.3
index a749bb5f691d..5608255009d9 100644
--- a/eBones/lib/libkrb/krb_sendauth.3
+++ b/eBones/lib/libkrb/krb_sendauth.3
@@ -1,5 +1,5 @@
 .\" from: krb_sendauth.3,v 4.1 89/01/23 11:10:58 jtkohl Exp $
-.\" $Id: krb_sendauth.3,v 1.1.1.1 1994/09/30 14:50:07 csgr Exp $
+.\" $Id: krb_sendauth.3,v 1.3 1995/07/18 16:41:03 mark Exp $
 .\" Copyright 1988 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
@@ -14,7 +14,7 @@ Kerberos routines for sending authentication via network stream sockets
 .nj
 .ft B
 #include <kerberosIV/krb.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <netinet/in.h>
 .PP
 .fi
@@ -52,7 +52,7 @@ struct sockaddr_in *faddr, *laddr;
 AUTH_DAT *auth_data;
 char *filename;
 Key_schedule schedule;
-char *version;			
+char *version;
 .PP
 .ft B
 int krb_net_write(fd, buf, len)
@@ -113,7 +113,7 @@ version string that the server program can then match against
 its own version string.
 The
 .I version
-string can be up to KSEND_VNO_LEN (see 
+string can be up to KSEND_VNO_LEN (see
 .IR <krb.h> )
 characters in length.
 
@@ -187,7 +187,7 @@ function to retrieve the ticket from the Kerberos server.
 The
 .I ktext
 argument must point to an existing ticket and authenticator (such as
-would be created by 
+would be created by
 .IR krb_mk_req ),
 and the
 .IR service,
@@ -200,7 +200,7 @@ If called with
 .I options
 set as KOPT_DONT_CANON,
 .I krb_sendauth
-will not convert the service's instance to canonical form using 
+will not convert the service's instance to canonical form using
 .IR krb_get_phost (3).
 
 If you want to call
@@ -253,7 +253,7 @@ argument may be set to "*" if the caller wishes
 .I krb_mk_req
 to fill in the instance used (note that there must be space in the
 .I inst
-argument to hold a full instance name, see 
+argument to hold a full instance name, see
 .IR krb_mk_req (3)).
 
 The
diff --git a/eBones/libexec/Makefile b/eBones/libexec/Makefile
new file mode 100644
index 000000000000..a586edc67bcc
--- /dev/null
+++ b/eBones/libexec/Makefile
@@ -0,0 +1,6 @@
+#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
+#	$Id$
+
+SUBDIR=	kpropd registerd
+
+.include <bsd.subdir.mk>
diff --git a/eBones/libexec/kpropd/Makefile b/eBones/libexec/kpropd/Makefile
index 59d7914ed023..93bb3e8b7c17 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.1.1.1 1995/08/03 07:37:19 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:51:49 mark Exp $
 
 PROG=	kpropd
-CFLAGS+=-I${.CURDIR}/../include -I${.CURDIR}/../kprop -Wall
-DPADD=	${LIBKRB}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-I${.CURDIR}/../../include -I${.CURDIR}/../../usr.sbin/kprop -Wall
+DPADD+=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
 BINDIR=	/usr/libexec
 NOMAN=	noman
 
diff --git a/eBones/libexec/registerd/Makefile b/eBones/libexec/registerd/Makefile
index 89b6ca7ab8bc..9966241d35d5 100644
--- a/eBones/libexec/registerd/Makefile
+++ b/eBones/libexec/registerd/Makefile
@@ -6,15 +6,14 @@
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
 #
-# $Id: Makefile,v 1.4 1995/07/18 16:41:24 mark Exp $
+# $Id$
 
 PROG=	registerd
 SRCS=	registerd.c
-CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../register \
-		-I${.CURDIR}/../include -Wall
-.PATH:	${.CURDIR}/../../usr.bin/rlogin
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/register \
+	-I${.CURDIR}/../../include -Wall
+DPADD+=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	registerd.8
 BINDIR=	/usr/libexec
 
diff --git a/eBones/usr.bin/Makefile b/eBones/usr.bin/Makefile
new file mode 100644
index 000000000000..babb928223ea
--- /dev/null
+++ b/eBones/usr.bin/Makefile
@@ -0,0 +1,6 @@
+#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
+#	$Id$
+
+SUBDIR=	kadmin kdestroy kinit klist ksrvtgt register
+
+.include <bsd.subdir.mk>
diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile
index 8eae17914328..0754009b896b 100644
--- a/eBones/usr.bin/kadmin/Makefile
+++ b/eBones/usr.bin/kadmin/Makefile
@@ -1,12 +1,13 @@
-#	$Id: Makefile,v 1.1 1995/07/18 16:36:53 mark Exp $
+#	$Id$
 
 BINDIR=	/usr/bin
 PROG=	kadmin
-SRCS=	kadmin.c kadmin_cmds.c
-CLEANFILES+=	kadmin_cmds.c
-CFLAGS+=	-DPOSIX -I${.CURDIR}/../include -I${KRBOBJDIR}
-CFLAGS+=	-I${.CURDIR}/../libkadm -Wall
-LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb -ldes
+SRCS=	kadmin.c kadmin_cmds.c krb_err.h
+CLEANFILES+=	kadmin_cmds.c krb_err.c
+CFLAGS+=	-DPOSIX -I${.CURDIR}/../../include \
+		-I${.CURDIR}/../../lib/libkadm -Wall
+DPADD= ${LIBKRB} ${LIBDES}
+LDADD+=	-lkadm -lkrb -ldes
 LDADD+=	-lss -lcom_err
 MAN8=	kadmin.8
 
@@ -14,6 +15,8 @@ kadmin_cmds.c:	kadmin_cmds.ct
 	test -e kadmin_cmds.ct || ln -s ${.CURDIR}/kadmin_cmds.ct .
 	mk_cmds kadmin_cmds.ct
 
-.include <bsd.prog.mk>
-
+krb_err.h:
+	test -e krb_err.et || ln -s ${.CURDIR}/../../lib/libkrb/krb_err.et .
+	compile_et krb_err.et
 
+.include <bsd.prog.mk>
diff --git a/eBones/usr.bin/kadmin/kadmin.c b/eBones/usr.bin/kadmin/kadmin.c
index fd9842802d2e..67e0e1fb2b41 100644
--- a/eBones/usr.bin/kadmin/kadmin.c
+++ b/eBones/usr.bin/kadmin/kadmin.c
@@ -32,7 +32,7 @@ static char rcsid_kadmin_c[] =
 #include <pwd.h>
 #include <ss/ss.h>
 #include <com_err.h>
-#include <krb_err.h>
+#include <kerberosIV/krb_err.h>
 #include <kadm.h>
 
 #define BAD_PW 1
diff --git a/eBones/usr.bin/kdestroy/Makefile b/eBones/usr.bin/kdestroy/Makefile
index 1e4da0a0f84a..c28d53755d16 100644
--- a/eBones/usr.bin/kdestroy/Makefile
+++ b/eBones/usr.bin/kdestroy/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:42 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:27 mark Exp $
 
 PROG=	kdestroy
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -DBSD42 -Wall
-DPADD=	${LIBKRB}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
-BINDIR=	/usr/bin
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -DBSD42 -Wall
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
 MAN1=	kdestroy.1
+BINDIR=	/usr/bin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/kinit/Makefile b/eBones/usr.bin/kinit/Makefile
index 884f37d7cc02..382360cde7bb 100644
--- a/eBones/usr.bin/kinit/Makefile
+++ b/eBones/usr.bin/kinit/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:53 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:36 mark Exp $
 
 PROG=	kinit
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -DBSD42 -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -DBSD42 -Wall
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
+LDADD=	-lkrb -ldes
 BINDIR=	/usr/bin
 MAN1=	kinit.1
 
diff --git a/eBones/usr.bin/klist/Makefile b/eBones/usr.bin/klist/Makefile
index c24800b9b509..0ff35779f44d 100644
--- a/eBones/usr.bin/klist/Makefile
+++ b/eBones/usr.bin/klist/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:57 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:40 mark Exp $
 
 PROG=	klist
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
+LDADD=	-lkrb -ldes
 BINDIR=	/usr/bin
 MAN1=	klist.1
 
diff --git a/eBones/usr.bin/ksrvtgt/Makefile b/eBones/usr.bin/ksrvtgt/Makefile
index 9bf166d79aa8..e1b6b5fe095f 100644
--- a/eBones/usr.bin/ksrvtgt/Makefile
+++ b/eBones/usr.bin/ksrvtgt/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:40:05 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:53:47 mark Exp $
 
 PROG=	ksrvtgt
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
 DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
+LDADD=	-lkrb -ldes
 BINDIR=	/usr/bin
 MAN1=	ksrvtgt.1
 
diff --git a/eBones/usr.bin/register/Makefile b/eBones/usr.bin/register/Makefile
index 9adfc93f8088..140b5644aa3e 100644
--- a/eBones/usr.bin/register/Makefile
+++ b/eBones/usr.bin/register/Makefile
@@ -1,12 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
-# $Id: Makefile,v 1.5 1995/07/18 16:41:22 mark Exp $
+#	$Id: Makefile,v 1.6 1995/09/07 20:54:18 mark Exp $
 
 PROG=	register
-SRCS=	register.c
-CFLAGS+=-DCRYPT -DDEBUG -DKERBEROS -I${.CURDIR}/../include -Wall
-.PATH:	${.CURDIR}/../../usr.bin/rlogin
-DPADD=	${LIBKRB}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes -lcrypt
+CFLAGS+=-DCRYPT -DDEBUG -DKERBEROS -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKRB} ${LIBDES} ${LIBCRYPT}
+LDADD=	-lkrb -ldes -lcrypt
 BINDIR=	/usr/bin
 BINOWN=	root
 BINMODE=4555
diff --git a/eBones/usr.sbin/Makefile b/eBones/usr.sbin/Makefile
new file mode 100644
index 000000000000..4d583fc0282f
--- /dev/null
+++ b/eBones/usr.sbin/Makefile
@@ -0,0 +1,7 @@
+#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
+#	$Id$
+
+SUBDIR=	ext_srvtab kadmind kdb_destroy kdb_edit kdb_init kdb_util \
+	kerberos kprop ksrvutil kstash make_keypair
+
+.include <bsd.subdir.mk>
diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile
index 7fb1f2938ba3..431b84745e91 100644
--- a/eBones/usr.sbin/ext_srvtab/Makefile
+++ b/eBones/usr.sbin/ext_srvtab/Makefile
@@ -1,10 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:35:54 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:50:29 mark Exp $
 
 PROG=	ext_srvtab
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../include  -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD+=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -I${.CURDIR}/../../include  -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD+=	-lkdb -lkrb -ldes
 MAN8=	ext_srvtab.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index f2e0357af94f..38cb3cbad004 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,11 +1,11 @@
-#	$Id: Makefile,v 1.1 1995/07/18 16:36:59 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:50:44 mark Exp $
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
-CFLAGS+=-DPOSIX -I${.CURDIR}/../include -I${KRBOBJDIR} \
-	-I${.CURDIR}/../libkadm -I${KADMOBJDIR} -Wall
-LDADD+=	-L${KADMOBJDIR} -lkadm -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
-	-ldes -L${ACLOBJDIR} -lacl -lcom_err
+CFLAGS+=-DPOSIX -I${.CURDIR}/../../include -I${.CURDIR}/../../lib/libkadm -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD+=	-lkadm -lkdb -lkrb -ldes -lacl -lcom_err
 MAN8=	kadmind.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kadmind/admin_server.c b/eBones/usr.sbin/kadmind/admin_server.c
index 72980d434ab1..6f8c7f78b267 100644
--- a/eBones/usr.sbin/kadmind/admin_server.c
+++ b/eBones/usr.sbin/kadmind/admin_server.c
@@ -35,7 +35,7 @@ static const char rcsid[] =
 #include <syslog.h>
 #include <com_err.h>
 #include <kadm.h>
-#include <kadm_err.h>
+#include <kerberosIV/kadm_err.h>
 #include <krb_db.h>
 #include "kadm_server.h"
 
diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c
index b8ddaa0132ce..b20a5666ac6b 100644
--- a/eBones/usr.sbin/kadmind/kadm_funcs.c
+++ b/eBones/usr.sbin/kadmind/kadm_funcs.c
@@ -12,7 +12,7 @@
 static char rcsid_kadm_funcs_c[] =
 "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
 static const char rcsid[] =
-	"$Id: kadm_funcs.c,v 1.1 1995/07/18 16:37:02 mark Exp $";
+	"$Id: kadm_funcs.c,v 1.2 1995/09/07 20:50:48 mark Exp $";
 #endif	lint
 #endif
 
@@ -26,7 +26,7 @@ the actual database manipulation code
 #include <com_err.h>
 #include <sys/param.h>
 #include <kadm.h>
-#include <kadm_err.h>
+#include <kerberosIV/kadm_err.h>
 #include <krb_db.h>
 #include "kadm_server.h"
 
diff --git a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
index 0fa1acefc43a..b6f47827b53e 100644
--- a/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
+++ b/eBones/usr.sbin/kadmind/kadm_ser_wrap.c
@@ -26,8 +26,8 @@ unwraps wrapped packets and calls the appropriate server subroutine
 #include <netdb.h>
 #include <sys/socket.h>
 #include <kadm.h>
-#include <kadm_err.h>
-#include <krb_err.h>
+#include <kerberosIV/kadm_err.h>
+#include <kerberosIV/krb_err.h>
 #include "kadm_server.h"
 
 Kadm_Server server_parm;
diff --git a/eBones/usr.sbin/kadmind/kadm_server.c b/eBones/usr.sbin/kadmind/kadm_server.c
index c6cbc6ac4e8c..c53af7b88336 100644
--- a/eBones/usr.sbin/kadmind/kadm_server.c
+++ b/eBones/usr.sbin/kadmind/kadm_server.c
@@ -16,7 +16,7 @@ static char rcsid_kadm_server_c[] =
 
 #include <string.h>
 #include <kadm.h>
-#include <kadm_err.h>
+#include <kerberosIV/kadm_err.h>
 #include "kadm_server.h"
 
 /*
diff --git a/eBones/usr.sbin/kdb_destroy/Makefile b/eBones/usr.sbin/kdb_destroy/Makefile
index f22f779e5c5c..7e9cef0980f0 100644
--- a/eBones/usr.sbin/kdb_destroy/Makefile
+++ b/eBones/usr.sbin/kdb_destroy/Makefile
@@ -1,8 +1,9 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:22 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:07 mark Exp $
 
 PROG=	kdb_destroy
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
 MAN8=	kdb_destroy.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile
index a56efcf6c3fa..a38714d3c37b 100644
--- a/eBones/usr.sbin/kdb_edit/Makefile
+++ b/eBones/usr.sbin/kdb_edit/Makefile
@@ -1,12 +1,12 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:25 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:11 mark Exp $
 
 PROG=	kdb_edit
-CFLAGS+=-DKERBEROS -DDEBUG -I. -I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I. -I${.CURDIR}/../../include -Wall
 SRCS=	kdb_edit.c maketime.c
-.PATH:	${.CURDIR}/../kdb_edit
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_edit.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile
index 4d6a1102b91e..f084232c48ba 100644
--- a/eBones/usr.sbin/kdb_init/Makefile
+++ b/eBones/usr.sbin/kdb_init/Makefile
@@ -1,10 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:34 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:18 mark Exp $
 
 PROG=	kdb_init
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_init.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile
index 134fd348f2ca..f04ae7177892 100644
--- a/eBones/usr.sbin/kdb_util/Makefile
+++ b/eBones/usr.sbin/kdb_util/Makefile
@@ -1,13 +1,14 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:38 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:22 mark Exp $
 
 PROG=	kdb_util
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../kdb_edit \
-	-I${.CURDIR}/../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit \
+	-I${.CURDIR}/../../include -Wall
 SRCS=	kdb_util.c maketime.c
 .PATH:	${.CURDIR}/../kdb_edit
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_util.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index 7db860e909e7..b32ca4e838c4 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,11 +1,12 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1995/07/18 16:37:47 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:51:30 mark Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 NOMAN=	noman
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index 636eaa45eff5..7f62e9ee8481 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.1.1.1 1995/08/03 07:36:18 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:51:44 mark Exp $
 
 PROG=	kprop
-CFLAGS+=-I${.CURDIR}/../include -Wall
-DPADD=	${LIBKRB}
-LDADD=	-L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
 BINDIR=	/usr/sbin
 NOMAN=	noman
 
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index a95d9aec78b4..dbe479f06193 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,9 +1,11 @@
-#	$Id: Makefile,v 1.1 1995/07/18 16:40:09 mark Exp $
+#	$Id: Makefile,v 1.2 1995/09/07 20:53:52 mark Exp $
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
-CFLAGS+=	-I${.CURDIR}/../include -I${.CURDIR}/../libkadm -Wall
-LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb -ldes -lcom_err
+CFLAGS+=	-I${.CURDIR}/../../include -I${.CURDIR}/../../lib/libkadm -Wall
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD+=	-lkadm -lkrb -ldes -lcom_err
 MAN8=	ksrvutil.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index 1387f8c1d143..664b8c9ce7c4 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,10 +1,11 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.3 1995/07/18 16:40:14 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/07 20:53:56 mark Exp $
 
 PROG=	kstash
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../include -Wall
-DPADD=	${LIBKDB} ${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
 MAN8=	kstash.8
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/make_keypair/Makefile b/eBones/usr.sbin/make_keypair/Makefile
index 7d435e747aa7..a1c38b26b81c 100644
--- a/eBones/usr.sbin/make_keypair/Makefile
+++ b/eBones/usr.sbin/make_keypair/Makefile
@@ -1,9 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
+#	$id$
 
 PROG=	make_keypair
 MAN8=	make_keypair.8
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../include -I${.CURDIR}/../register -Wall
-DPADD=	${LIBKRB}
-LDADD=	-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
+CFLAGS+=-DKERBEROS -I${.CURDIR}/../../include \
+	-I${.CURDIR}/../../usr.bin/register -Wall
+DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
+LDADD=	-lkdb -lkrb -ldes
+BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>