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
This commit is contained in:
parent
1bd8396e4c
commit
7e5cb9f62f
@ -90,9 +90,7 @@ mk32() {
|
|||||||
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
make distclean
|
make distclean
|
||||||
#ClearHostSysNameing32 $TMPROOT
|
|
||||||
mv $TMPROOT/opt/MySQL/bin/mysql_config{,-32}
|
mv $TMPROOT/opt/MySQL/bin/mysql_config{,-32}
|
||||||
#GenDynLib32 $TMPROOT/opt/MySQL/lib/mysql/libmysqld.a 16.0.0
|
|
||||||
cd ..
|
cd ..
|
||||||
rm -r build
|
rm -r build
|
||||||
mkdir build
|
mkdir build
|
||||||
@ -105,7 +103,8 @@ mk() {
|
|||||||
fi
|
fi
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
cmake -DCMAKE_INSTALL_PREFIX=/opt/MySQL \
|
cmake -DCMAKE_INSTALL_PREFIX=/opt/MySQL \
|
||||||
-DINSTALL_LIBDIR=/opt/MySQL/lib64 \
|
-DINSTALL_LIBDIR=${LIBDIR} \
|
||||||
|
-DINSTALL_PLUGINDIR=${LIBDIR}/plugin \
|
||||||
-DCMAKE_CXX_FLAGS="$BUILDOPTIONS" \
|
-DCMAKE_CXX_FLAGS="$BUILDOPTIONS" \
|
||||||
-DCMAKE_C_FLAGS="$BUILDOPTIONS" \
|
-DCMAKE_C_FLAGS="$BUILDOPTIONS" \
|
||||||
-DSYSCONFDIR=/etc \
|
-DSYSCONFDIR=/etc \
|
||||||
@ -113,7 +112,6 @@ mk() {
|
|||||||
make -j $NUMCPU &&
|
make -j $NUMCPU &&
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
make -j $NUMCPU DESTDIR=$TMPROOT install &&
|
||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
#GenDynLib $TMPROOT/opt/MySQL/$LIBDIR/mysql/libmysqld.a 16.0.0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
|
Loading…
Reference in New Issue
Block a user