mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 06:05:32 +02:00
Manual merge from mysql-trunk.
Conflicts: - scripts/CMakeLists.txt
This commit is contained in:
commit
b5eac2b2ce
16 changed files with 260 additions and 76 deletions
|
|
@ -88,6 +88,8 @@ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
|
|||
fix_path pkglibdir $pkglibdir_rel lib/mysql lib
|
||||
|
||||
plugindir='@pkgplugindir@'
|
||||
plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
|
||||
fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
|
||||
|
||||
pkgincludedir='@pkgincludedir@'
|
||||
fix_path pkgincludedir include/mysql include
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue