From 22276584a8d20b54dd986af63329a5ecd4664e11 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Fri, 27 Jun 2008 22:49:46 -0700
Subject: [PATCH] Pull upstream change to install klog.krb5

Also pull the upstream Makefile.in change to install klog.krb5 so that
we don't have to do it ourselves.
---
 debian/openafs-krb5.install |  2 ++
 debian/rules                |  4 ----
 src/aklog/Makefile.in       | 12 ++++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/openafs-krb5.install b/debian/openafs-krb5.install
index 006e4619b..3636aed50 100644
--- a/debian/openafs-krb5.install
+++ b/debian/openafs-krb5.install
@@ -1,9 +1,11 @@
 debian/tmp/usr/bin/aklog                usr/bin
+debian/tmp/usr/bin/klog.krb5            usr/bin
 
 debian/tmp/usr/bin/asetkey              usr/sbin
 debian/tmp/usr/sbin/ka-forwarder        usr/sbin
 
 debian/tmp/usr/share/man/man1/aklog.1           usr/share/man/man1
+debian/tmp/usr/share/man/man1/klog.krb5.1       usr/share/man/man1
 
 debian/tmp/usr/share/man/man8/asetkey.8         usr/share/man/man8
 debian/tmp/usr/share/man/man8/ka-forwarder.8    usr/share/man/man8
diff --git a/debian/rules b/debian/rules
index 95cebd656..8305ad31e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,10 +151,6 @@ install-stamp: build-stamp
 	mv debian/openafs-client/usr/bin/up \
 	    debian/openafs-client/usr/bin/afs-up
 
-	install -m 755 -c src/aklog/klog \
-	    debian/openafs-krb5/usr/bin/klog.krb5
-	install -m 644 -c doc/man-pages/man1/klog.krb5.1 \
-	    debian/openafs-krb5/usr/share/man/man1/klog.krb5.1
 	install -m 644 -c debian/tmp/usr/lib/pam_afs.so.1 \
 	    debian/libpam-openafs-kaserver/lib/security/pam_afs.so
 	install -m 644 -c debian/tmp/usr/lib/pam_afs.krb.so.1 \
diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index e799373f8..e1ad162b4 100644
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -32,20 +32,28 @@ klog: klog.o skipwrap.o ${AFSLIBS}
 # Installation targets
 #
 install: \
-	${DESTDIR}${bindir}/aklog ${DESTDIR}${afssrvbindir}/asetkey
+	${DESTDIR}${bindir}/aklog ${DESTDIR}${bindir}/klog.krb5 \
+	${DESTDIR}${afssrvbindir}/asetkey
 
 ${DESTDIR}${bindir}/aklog: aklog
 	${INSTALL} $? $@
 
+${DESTDIR}${bindir}/klog.krb5: klog
+	${INSTALL} $? $@
+
 ${DESTDIR}${afssrvbindir}/asetkey: asetkey
 	${INSTALL} $? $@
 
 dest: \
-	${DEST}/bin/aklog ${DEST}/root.server/usr/afs/bin/asetkey
+	${DEST}/bin/aklog ${DEST}/bin/klog.krb5 \
+	${DEST}/root.server/usr/afs/bin/asetkey
 
 ${DEST}/bin/aklog: aklog
 	${INSTALL} $? $@
 
+${DEST}/bin/klog.krb5: klog
+	${INSTALL} $? $@
+
 ${DEST}/root.server/usr/afs/bin/asetkey: asetkey
 	${INSTALL} $? $@
 
-- 
2.39.5