From e41edd32391dc671abbda6c18dd99c1da38b6c3c Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 19 Jan 2010 12:54:18 +0000
Subject: [PATCH] Korrekturen. Installiert jetzt die 64 Bit bin richtig, und
 die 32 Bit Libs sind auch wirklich 32 bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5140 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/security/qca | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SysBuild/security/qca b/SysBuild/security/qca
index 4f81c1b..dbde52e 100644
--- a/SysBuild/security/qca
+++ b/SysBuild/security/qca
@@ -82,7 +82,7 @@ mk32() {
 	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=32 \
 	./configure --prefix=/usr
-	make -j $NUMCPU CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32"
+	make -j $NUMCPU CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32" USE_ARCH=32
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install
 	make distclean
 }
@@ -98,6 +98,13 @@ mk() {
 		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU INSTALL_ROOT=$TMPROOT install
+	if [ "$MK64BIT" == "true" ]; then
+		if [ -d $TMPROOT/usr/src/qca-*/src/lib64 ]; then
+			mv $TMPROOT/usr/src/qca-*/src/lib64 $TMPROOT/usr/
+			mv $TMPROOT/usr/src/qca-*/lib64/* $TMPROOT/usr/lib64
+			rm -r $TMPROOT/usr/src/qca-*
+		fi
+	fi
 }
 
 postmk() {