diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-08 01:16:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-08 01:16:32 +0200 |
| commit | ffd9c77e080ce570217bf517b9ea3b4c07fe5f8e (patch) | |
| tree | ca6d2685e7dd92066877f271dbdf47988346731d /scripts/mysql_config.sh | |
| parent | 8035c986d4c41f5e5d7f4032e7af71cbf63ce6f4 (diff) | |
| parent | e19b07e657eb94a9d09ff39947287a020de314f3 (diff) | |
| download | mariadb-git-ffd9c77e080ce570217bf517b9ea3b4c07fe5f8e.tar.gz | |
merge
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 4bf95cccbe6..4909d5d0a87 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -76,7 +76,8 @@ get_full_path () me=`get_full_path $0` -basedir=`echo $me | sed -e 's;/bin/mysql_config;;'` +# Script might have been renamed but assume mysql_<something>config<something> +basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'` ldata='@localstatedir@' execdir='@libexecdir@' @@ -85,11 +86,11 @@ bindir='@bindir@' # If installed, search for the compiled in directory first (might be "lib64") pkglibdir='@pkglibdir@' pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` -fix_path pkglibdir $pkglibdir_rel lib64/mysql lib64 lib/mysql lib +fix_path pkglibdir $pkglibdir_rel @libsubdir@/mysql @libsubdir@ plugindir='@pkgplugindir@' plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` -fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin +fix_path plugindir $plugindir_rel @libsubdir@/mysql/plugin @libsubdir@/plugin pkgincludedir='@pkgincludedir@' fix_path pkgincludedir include/mysql |