From 099f1b592a9f136c18e0ed4e45e5c046e74c5513 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 20 Sep 2011 22:57:21 +0000
Subject: Fix smartauthmon installation failure Fixm cryptluks initrd setup on
 multiarch systems

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/smartcardauth@1254703 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 Makefile                                    | 1 +
 usr/share/initramfs-tools/hooks/cryptlukssc | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 236a57a..9259b90 100755
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ install:
 
 	mkdir -p $(DESTDIR)/usr
 	cp -Rp src/ckpasswd usr/bin/smartauthckpasswd
+	cp -Rp src/smartauthmon usr/bin/smartauthmon
 	cp -Rp usr/*  $(DESTDIR)/usr/
 
 	mkdir -p $(DESTDIR)/etc
diff --git a/usr/share/initramfs-tools/hooks/cryptlukssc b/usr/share/initramfs-tools/hooks/cryptlukssc
index aebd75e..6a9c067 100755
--- a/usr/share/initramfs-tools/hooks/cryptlukssc
+++ b/usr/share/initramfs-tools/hooks/cryptlukssc
@@ -30,7 +30,12 @@ done
 # pcscd utilizes pthread_cancel
 mkdir -p ${DESTDIR}/lib
 copy_exec /usr/sbin/pcscd /sbin
-copy_exec /lib/libgcc_s.so.1 /lib
+if [ -e /lib/*/libgcc_s.so.1 ]
+then
+  copy_exec /lib/*/libgcc_s.so.1 /lib
+else
+  copy_exec /lib/libgcc_s.so.1 /lib
+fi
 copy_exec /lib/libpcsclite.so.1 /lib
 cp -r /usr/lib/pcsc ${DESTDIR}/usr/lib
 cp /etc/reader.conf ${DESTDIR}/etc
-- 
cgit v1.2.3