X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=blobdiff_plain;f=debian%2Fpatches%2F010_multiarch-makefile.patch;h=cca32e8f6ffd9123b60f1742f21f5d26924ab2c6;hp=7155344eb21416d1dfacec81e2b3fc98193502e2;hb=e7e83f59efa137060ffa4986cde74731c459e7bf;hpb=e21690e3e5b8ec21dff7fd0cd52d82e7074a9010

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'; \