From: Ian Beckwith <ianb@erislabs.net>
Date: Wed, 22 Jan 2014 23:30:47 +0000 (+0000)
Subject: Fix FTBFS. Thanks to YunQiang Su for the patch (Closes: #713603)
X-Git-Tag: 302-4~1
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=e7e83f59efa137060ffa4986cde74731c459e7bf

Fix FTBFS. Thanks to YunQiang Su for the patch (Closes: #713603)
---

diff --git a/debian/changelog b/debian/changelog
index 012b273..76e2a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 ckermit (302-4) unstable; urgency=low
 
+  * Fix FTBFS. Thanks to YunQiang Su for the patch (Closes: #713603).
   * Standards-Version: 3.9.5.
   * Add Vcs- fields.
 
- -- Ian Beckwith <ianb@debian.org>  Wed, 22 Jan 2014 23:05:37 +0000
+ -- Ian Beckwith <ianb@debian.org>  Wed, 22 Jan 2014 23:30:35 +0000
 
 ckermit (302-3) unstable; urgency=low
 
diff --git a/debian/patches/010_multiarch-makefile.patch b/debian/patches/010_multiarch-makefile.patch
index 7155344..cca32e8 100644
--- a/debian/patches/010_multiarch-makefile.patch
+++ b/debian/patches/010_multiarch-makefile.patch
@@ -8,8 +8,8 @@ Last-Update: 2012-01-29
 
 Index: ckermit/makefile
 ===================================================================
---- ckermit.orig/makefile	2012-01-29 00:15:30.000000000 +0000
-+++ ckermit/makefile	2012-01-29 00:32:46.000000000 +0000
+--- ckermit.orig/makefile	2014-01-22 23:19:35.000000000 +0000
++++ ckermit/makefile	2014-01-22 23:22:14.000000000 +0000
 @@ -6100,10 +6100,14 @@
  	   test -f /usr/lib/libncurses.a  || \
  	   test -f /usr/lib/libncurses.so; then \
@@ -47,7 +47,7 @@ Index: ckermit/makefile
  	then echo -llockdev; fi`" \
  	linuxa
  
-@@ -6309,7 +6316,9 @@
+@@ -6309,15 +6316,20 @@
  		K5CRYPTO='-lk5crypto'; \
          else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
                  K5CRYPTO='-lk5crypto'; \
@@ -58,7 +58,10 @@ Index: ckermit/makefile
  	COM_ERR=''; \
  	if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
  		COM_ERR='-lcom_err'; \
-@@ -6317,7 +6326,7 @@
+ 	fi; \
++	else if ls /lib/$(MULTIARCH)/libcom_err* > /dev/null 2> /dev/null; then \
++		COM_ERR='-lcom_err'; \
++	fi; \
  	GSSAPILIB='-lgssapi'; \
  	if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
  		GSSAPILIB='-lgssapi_krb5'; \
diff --git a/makefile b/makefile
index 5292706..59450f4 100644
--- a/makefile
+++ b/makefile
@@ -6323,6 +6323,9 @@ linux+krb5+ssl linux+krb5+openssl:
 	if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
 		COM_ERR='-lcom_err'; \
 	fi; \
+	else if ls /lib/$(MULTIARCH)/libcom_err* > /dev/null 2> /dev/null; then \
+		COM_ERR='-lcom_err'; \
+	fi; \
 	GSSAPILIB='-lgssapi'; \
 	if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
 		GSSAPILIB='-lgssapi_krb5'; \