diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
| commit | 9503a8e23f25aa13d68d41444473996f28a7de3d (patch) | |
| tree | 6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /scripts/mysql_config.sh | |
| parent | 83c154dc34095f8fea8221d56ffc55c002df8694 (diff) | |
| parent | 226852ea145c39543926171cd5f1eadc5deca356 (diff) | |
| download | mariadb-git-9503a8e23f25aa13d68d41444473996f28a7de3d.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- scripts/CMakeLists.txt
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 0840a99e6e2..10755fc698b 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -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 |