From 418aa2f9d383f80b820df089f0d148dc20cf6efd Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 28 May 2014 12:41:25 +0200
Subject: [PATCH] hooks/prepare-32bit: in full mode also preserve usr/lib,
 moving it to usr/lib32.

---
 common/hooks/post-install/06-prepare-32bit.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/hooks/post-install/06-prepare-32bit.sh b/common/hooks/post-install/06-prepare-32bit.sh
index e175371d9ca..d2c52e3e59b 100644
--- a/common/hooks/post-install/06-prepare-32bit.sh
+++ b/common/hooks/post-install/06-prepare-32bit.sh
@@ -62,7 +62,13 @@ hook() {
 		mkdir -p ${destdir32}
 		cp -a ${PKGDESTDIR}/* ${destdir32}/
 		# remove symlink
-		rm ${destdir32}/usr/lib32
+		if [ -h ${destdir32}/usr/lib32 ]; then
+			rm ${destdir32}/usr/lib32
+		fi
+		# if /usr/lib dir exists move it to lib32.
+		if [ -d ${destdir32}/usr/lib ]; then
+			mv ${destdir32}/usr/lib ${destdir32}/usr/lib32
+		fi
 	fi
 	if [ ! -d ${destdir32} ]; then
 		return