diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
| commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
| tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /scripts/mysql_config.sh | |
| parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
| parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
| download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz | |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
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 beff6e5eb5f..e4640961b34 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 |