From 7e5cb9f62fd80f6e057d20bf1d224ac65d5638fb Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 6 Apr 2011 09:38:55 +0000
Subject: [PATCH] Korrektur fuer libdir und plugindir, so dass das auch korrekt
 in mysql_config hinterlegt wird

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6067 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/dbase/mysql | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/SysBuild/dbase/mysql b/SysBuild/dbase/mysql
index 6d6893f..533379d 100644
--- a/SysBuild/dbase/mysql
+++ b/SysBuild/dbase/mysql
@@ -90,9 +90,7 @@ mk32() {
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
 	make distclean
-	#ClearHostSysNameing32 $TMPROOT
 	mv $TMPROOT/opt/MySQL/bin/mysql_config{,-32}
-	#GenDynLib32 $TMPROOT/opt/MySQL/lib/mysql/libmysqld.a 16.0.0
 	cd ..
 	rm -r build
 	mkdir build
@@ -105,7 +103,8 @@ mk() {
 	fi
 	USE_ARCH=$UARCH \
 	cmake -DCMAKE_INSTALL_PREFIX=/opt/MySQL \
-	      -DINSTALL_LIBDIR=/opt/MySQL/lib64 \
+	      -DINSTALL_LIBDIR=${LIBDIR} \
+	      -DINSTALL_PLUGINDIR=${LIBDIR}/plugin \
 	      -DCMAKE_CXX_FLAGS="$BUILDOPTIONS" \
 	      -DCMAKE_C_FLAGS="$BUILDOPTIONS" \
 	      -DSYSCONFDIR=/etc \
@@ -113,7 +112,6 @@ mk() {
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install &&
 	CheckError "Make install process failed !" 1
-	#GenDynLib $TMPROOT/opt/MySQL/$LIBDIR/mysql/libmysqld.a 16.0.0
 }
 
 postmk() {