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() {