From: Ian Beckwith <ianb@erislabs.net>
Date: Thu, 23 Jan 2014 22:29:03 +0000 (+0000)
Subject: Fix FTBFS: botched modification of YunQiang Su's perfectly good patch
X-Git-Tag: 302-5
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=7868b0b37a922d8d7ec6851f9584b67a44a5dcff

Fix FTBFS: botched modification of YunQiang Su's perfectly good patch
---

diff --git a/debian/changelog b/debian/changelog
index d663b9f..8ab64d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ckermit (302-5) unstable; urgency=low
+
+  * Fix FTBFS: botched modification of YunQiang Su's
+    perfectly good patch.
+
+ -- Ian Beckwith <ianb@debian.org>  Thu, 23 Jan 2014 22:09:43 +0000
+
 ckermit (302-4) unstable; urgency=low
 
   * Fix FTBFS. Thanks to YunQiang Su for the patch (Closes: #713603).
diff --git a/debian/patches/010_multiarch-makefile.patch b/debian/patches/010_multiarch-makefile.patch
index cca32e8..6e48a2d 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	2014-01-22 23:19:35.000000000 +0000
-+++ ckermit/makefile	2014-01-22 23:22:14.000000000 +0000
+--- ckermit.orig/makefile	2014-01-23 22:02:24.000000000 +0000
++++ ckermit/makefile	2014-01-23 22:05:38.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,15 +6316,20 @@
+@@ -6309,15 +6316,19 @@
  		K5CRYPTO='-lk5crypto'; \
          else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
                  K5CRYPTO='-lk5crypto'; \
@@ -58,10 +58,10 @@ Index: ckermit/makefile
  	COM_ERR=''; \
  	if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
  		COM_ERR='-lcom_err'; \
- 	fi; \
+-	fi; \
 +	else if ls /lib/$(MULTIARCH)/libcom_err* > /dev/null 2> /dev/null; then \
 +		COM_ERR='-lcom_err'; \
-+	fi; \
++	fi; fi; \
  	GSSAPILIB='-lgssapi'; \
  	if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
  		GSSAPILIB='-lgssapi_krb5'; \
diff --git a/makefile b/makefile
index 59450f4..41eee42 100644
--- a/makefile
+++ b/makefile
@@ -6322,10 +6322,9 @@ linux+krb5+ssl linux+krb5+openssl:
 	COM_ERR=''; \
 	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; \
+	fi; fi; \
 	GSSAPILIB='-lgssapi'; \
 	if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
 		GSSAPILIB='-lgssapi_krb5'; \