After the Great eBones Repository Copy (tm), make ebones actually

compile
1) remove rubbish no longer needed
2) correct existing Makefiles
3) add new makefiles where needed
4) correct code, header files and man pages where necessary

PLEASE NOTE - after this you will need to make install in eBones/include,
and mamake obj depend all install in eBones/lib before doing a
make obj depend all install in eBones/. (I am going 6to fix src/Makefile
next)
PS - I hate slow international links - apologies for all the typos

8 files changed, 36 insertions, 29 deletions

diff --git a/eBones/usr.bin/Makefile b/eBones/usr.bin/Makefile
new file mode 100644
index 0000000..babb928
--- /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 8eae179..0754009 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 fd98428..67e0e1f 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 1e4da0a..c28d537 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 884f37d..382360c 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 c24800b..0ff3577 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 9bf166d..e1b6b5f 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 9adfc93..140b564 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