import multiarch patch from ubuntu, modified to check multiarch dirs for all libs

[ckermit.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index ab73041..b6def6b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 BUILDDIR=`pwd`/debian/ckermit
 
 CFLAGS =-g \
@@ -22,7 +24,7 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
        CFLAGS += -DSELECT
 endif
 
-MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
+MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' MULTIARCH=\"$(DEB_HOST_MULTIARCH)\" LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
 MAKETARGET=linux+krb5+openssl
 
 %:
@@ -50,7 +52,7 @@ override_dh_auto_install:
        rm "$(BUILDDIR)/usr/share/doc/ckermit/COPYING.TXT"
 
 override_dh_installchangelogs:
-       dh_installchangelogs -k ckc301.txt
+       dh_installchangelogs -k ckc302.txt
 
 override_dh_installpam:
        dh_installpam --name=kermit