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.

diff --git a/debian/openafs-krb5.install b/debian/openafs-krb5.install
index 006e4619b6e6b9807bd70f6ed5a1dbd635278d2a..3636aed50b99b92481731ac53adbe758f8c3f02f 100644 (file)
--- 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 95cebd6561ccc0847dbcd77cb92224423c633ed4..8305ad31e919c3368043bf5a9c142a1313966a63 100755 (executable)
--- 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 e799373f8a6db797403e7aa3ceeac26135c741f3..e1ad162b46e61aead6ee4673bb2dfca31644a7dc 100644 (file)
--- 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} $? $@