summaryrefslogtreecommitdiff
path: root/scripts/mysql_config.sh
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@ibmvm>2010-07-19 18:00:29 +0400
committerAlexander Nozdrin <alik@ibmvm>2010-07-19 18:00:29 +0400
commitb5eac2b2cec6919a57adc5dbf6dae39ce5525eff (patch)
tree6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /scripts/mysql_config.sh
parent917c33cfbf7feade67ae4d4d884870e8f96f822e (diff)
parente875a1d66b83b758c34d2190ffd180bd626327ea (diff)
downloadmariadb-git-b5eac2b2cec6919a57adc5dbf6dae39ce5525eff.tar.gz
Manual merge from mysql-trunk.
Conflicts: - scripts/CMakeLists.txt
Diffstat (limited to 'scripts/mysql_config.sh')
-rw-r--r--scripts/mysql_config.sh2
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