From b0195a5b3b6519bfeaa64562fe96c9f4d99efd0b Mon Sep 17 00:00:00 2001
From: Hans Insulander <hin@cvs.openbsd.org>
Date: Thu, 15 May 2003 04:16:11 +0000
Subject: Deal with some common filenames.

---
 lib/libkrb5/Makefile          |  4 +++-
 lib/libkrb5/Makefile.kafs.inc |  7 +++++--
 lib/libkrb5/Makefile.krb5.inc | 11 ++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'lib/libkrb5')

diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile
index a46471fbdaa..5223362027e 100644
--- a/lib/libkrb5/Makefile
+++ b/lib/libkrb5/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/15 00:38:39 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/05/15 04:16:10 hin Exp $
 
 KRB5DIR=	${.CURDIR}/../../kerberosV
 .include "Makefile.common.inc"
 
 LIB	= krb5
 
+.PATH:	${KRB5SRC}/lib
+
 .include "Makefile.asn1.inc"
 .include "Makefile.hdb.inc"
 .include "Makefile.kafs.inc"
diff --git a/lib/libkrb5/Makefile.kafs.inc b/lib/libkrb5/Makefile.kafs.inc
index 4406a1addbe..fca38a7acbd 100644
--- a/lib/libkrb5/Makefile.kafs.inc
+++ b/lib/libkrb5/Makefile.kafs.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.kafs.inc,v 1.1 2003/05/14 09:05:59 hin Exp $
+# $OpenBSD: Makefile.kafs.inc,v 1.2 2003/05/15 04:16:10 hin Exp $
 
 INCLUDE_FILES+=	${KRB5SRC}/lib/kafs/kafs.h
 
@@ -8,7 +8,7 @@ CFLAGS += -I${KRB5SRC}/lib/kafs
 
 SRCS+=	afssys_openbsd.c \
 	afskrb5.c \
-	common.c \
+	kafs_common.c \
 	kafs_locl.h \
 	afssysdefs.h
 
@@ -21,3 +21,6 @@ MLINKS+=kafs.3 k_hasafs.3 \
 	kafs.3 krb_afslog.3 \
 	kafs.3 krb_afslog_uid.3
 
+kafs_common.c:	${KRB5SRC}/lib/kafs/common.c
+	ln -sf ${KRB5SRC}/lib/kafs/common.c kafs_common.c
+
diff --git a/lib/libkrb5/Makefile.krb5.inc b/lib/libkrb5/Makefile.krb5.inc
index abad791dae5..fd66d1d2d8c 100644
--- a/lib/libkrb5/Makefile.krb5.inc
+++ b/lib/libkrb5/Makefile.krb5.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.krb5.inc,v 1.1 2003/05/14 09:05:59 hin Exp $
+# $OpenBSD: Makefile.krb5.inc,v 1.2 2003/05/15 04:16:10 hin Exp $
 
 INCLUDE_FILES+=	${KRB5SRC}/lib/krb5/{krb5.h,krb5-protos.h,krb5-private.h} \
 		${KRB5DIR}/include/krb5-types.h \
@@ -174,7 +174,7 @@ SRCS+=	add_et_list.c \
 	init_creds.c \
 	init_creds_pw.c \
 	keyblock.c \
-	keytab.c \
+	krb5_keytab.c \
 	keytab_any.c \
 	keytab_file.c \
 	keytab_memory.c \
@@ -253,4 +253,9 @@ krb5_net_write.c:      ${KRB5SRC}/lib/krb5/net_write.c
 	ln -sf ${KRB5SRC}/lib/krb5/net_write.c krb5_net_write.c
 krb5_net_read.c:       ${KRB5SRC}/lib/krb5/net_read.c
 	ln -sf ${KRB5SRC}/lib/krb5/net_read.c krb5_net_read.c
-CLEANFILES+=krb5_net_{read,write}.c
\ No newline at end of file
+
+krb5_keytab.c:       ${KRB5SRC}/lib/krb5/keytab.c
+	ln -sf ${KRB5SRC}/lib/krb5/keytab.c krb5_keytab.c
+
+CLEANFILES+=krb5_net_{read,write}.c krb5_keytab.c
+
-- 
cgit v1.2.3