Commit 431da59f authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

1. centos has symlinks /bin->usr/bin and /sbin -> usr/sbin,

but even if this script called as /bin/mysql_install_db
it is still standard install and scripts are in /usr/share/
(but not in the /share/)
2. fix of bindir path
parent 2de0b57d
...@@ -302,6 +302,8 @@ fi ...@@ -302,6 +302,8 @@ fi
parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db` parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db`
parse_arguments PICK-ARGS-FROM-ARGV "$@" parse_arguments PICK-ARGS-FROM-ARGV "$@"
rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mysqld"
# Configure paths to support files # Configure paths to support files
if test -n "$srcdir" if test -n "$srcdir"
then then
...@@ -341,12 +343,12 @@ then ...@@ -341,12 +343,12 @@ then
exit 1 exit 1
fi fi
# relative from where the script was run for a relocatable install # relative from where the script was run for a relocatable install
elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld" elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
then then
basedir="$dirname0" basedir="$dirname0"
bindir="$basedir/@INSTALL_SBINDIR@" bindir="$basedir/@INSTALL_BINDIR@"
resolveip="$bindir/resolveip" resolveip="$bindir/resolveip"
mysqld="$basedir/@INSTALL_SBINDIR@/mysqld" mysqld="$rel_mysqld"
srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@" buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment