Fixes to allow eBones to properly bootstrap in a release environment

Submitted by:	joerg

5 files changed, 8 insertions, 8 deletions

diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index 6245776982bb..af3bbe7108d3 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,8 +1,8 @@
-#	$Id: Makefile,v 1.5 1995/09/14 04:09:38 gibbs Exp $
+#	$Id$
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
-CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm
+CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KADMOBJDIR} -I${KRBOBJDIR}
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD+=	-L${KADMOBJDIR} -lkadm -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
 	-L${DESOBJDIR} -ldes -L${ACLOBJDIR} -lacl -lcom_err
diff --git a/eBones/usr.sbin/kadmind/admin_server.c b/eBones/usr.sbin/kadmind/admin_server.c
index 6f8c7f78b267..72980d434ab1 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 <kerberosIV/kadm_err.h>
+#include <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 b20a5666ac6b..47dd4b405f62 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.2 1995/09/07 20:50:48 mark Exp $";
+	"$Id$";
 #endif	lint
 #endif
 
@@ -26,7 +26,7 @@ the actual database manipulation code
 #include <com_err.h>
 #include <sys/param.h>
 #include <kadm.h>
-#include <kerberosIV/kadm_err.h>
+#include <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 b6f47827b53e..0fa1acefc43a 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 <kerberosIV/kadm_err.h>
-#include <kerberosIV/krb_err.h>
+#include <kadm_err.h>
+#include <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 c53af7b88336..c6cbc6ac4e8c 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 <kerberosIV/kadm_err.h>
+#include <kadm_err.h>
 #include "kadm_server.h"
 
 /*