Move afslog from kerberosIV to the kerberosV tree.

4 files changed, 25 insertions, 21 deletions

diff --git a/kerberosIV/usr.bin/Makefile b/kerberosIV/usr.bin/Makefile
index f764ca7716c..690fa6451bc 100644
--- a/kerberosIV/usr.bin/Makefile
+++ b/kerberosIV/usr.bin/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2001/06/25 16:31:49 hin Exp $
+# $OpenBSD: Makefile,v 1.4 2002/06/11 15:26:49 hin Exp $
 
 .include <bsd.own.mk> # for KERBEROS5
 
-SUBDIR=	afslog
-
 .if(${KERBEROS5:L} != "yes")
 SUBDIR+=kauth kdestroy kinit klist pagsh
 .endif
diff --git a/kerberosIV/usr.bin/afslog/Makefile b/kerberosIV/usr.bin/afslog/Makefile
deleted file mode 100644
index d5d8c066742..00000000000
--- a/kerberosIV/usr.bin/afslog/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $OpenBSD: Makefile,v 1.7 2002/06/10 18:41:04 hin Exp $
-
-PROG	= afslog
-
-KRBDEPTH=../..
-.include "../../Makefile.inc"
-
-.PATH:	${KRBSRC}/appl/afsutil
-
-CFLAGS	+= -I. -I${DESTDIR}/usr/include/kerberosV
-DPADD	+= ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} ${LIBASN1}
-LDADD	+= -lkafs -lkrb5 -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN}
-
-SRCS	= aklog.c
-
-.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/Makefile b/kerberosV/usr.bin/Makefile
index dcf5066e737..ad26532cc99 100644
--- a/kerberosV/usr.bin/Makefile
+++ b/kerberosV/usr.bin/Makefile
@@ -1,7 +1,15 @@
-# $OpenBSD: Makefile,v 1.6 2001/06/27 16:17:09 hin Exp $
+# $OpenBSD: Makefile,v 1.7 2002/06/11 15:26:49 hin Exp $
 
 # XXX asn1_compile is compiled in ../Makefile
 
-SUBDIR	=  kauth klist kdestroy kinit pagsh verify_krb5_conf kf string2key
+SUBDIR=	afslog \
+	kauth \
+	kdestroy \
+	kf \
+	kinit \
+	klist \
+	pagsh \
+	string2key \
+	verify_krb5_conf
 
 .include <bsd.subdir.mk>
diff --git a/kerberosV/usr.bin/afslog/Makefile b/kerberosV/usr.bin/afslog/Makefile
new file mode 100644
index 00000000000..11e56a9a8c2
--- /dev/null
+++ b/kerberosV/usr.bin/afslog/Makefile
@@ -0,0 +1,14 @@
+# $OpenBSD: Makefile,v 1.1 2002/06/11 15:26:49 hin Exp $
+
+KRBDEPTH=../..
+.include <${.CURDIR}/../../Makefile.inc>
+
+PROG	= afslog
+
+.PATH:	${KRB5SRC}/appl/afsutil
+
+CFLAGS	+= -I.
+DPADD	+= ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} ${LIBASN1}
+LDADD	+= -lkafs -lkrb5 -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} -lcom_err
+
+.include <bsd.prog.mk>