Commit 50e59338 authored by Daniel Black's avatar Daniel Black Committed by Sergei Golubchik

MDEV-14580: mysql_install_db elements based on dirname of mysql_install_db

Closes #1086
parent 0d3c49ef
......@@ -253,6 +253,9 @@ then
cannot_find_file my_print_defaults $basedir/bin $basedir/extra
exit 1
fi
elif test -x "$(dirname $0)/../@bindir@/my_print_defaults"
then
print_defaults="$(dirname $0)/../@bindir@/my_print_defaults"
else
print_defaults="@bindir@/my_print_defaults"
fi
......@@ -304,6 +307,14 @@ then
cannot_find_file fill_help_tables.sql @pkgdata_locations@
exit 1
fi
# relative from where the script was run for a relocatable install
elif test -x "$(dirname $0)/../@INSTALL_SBINDIR@/mysqld"
then
basedir="$(dirname $0)/../"
bindir="$basedir/@INSTALL_SBINDIR@"
resolveip="$bindir/resolveip"
mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
pkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
else
basedir="@prefix@"
bindir="@bindir@"
......
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