database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix make distcheck.

Browse Source 
scripts/mysql_install_db.sh:
  Give precedence to basedir if both basedir and srcdir are specified, but set mysqld_opt, pkgdatadir and scriptdir always from srcdir if it is specified. This is to unbreak out-of-directory builds like make distcheck does, where we don't have binaries in srcdir.
This commit is contained in:
unknown
2007-11-23 13:38:59 +01:00
parent 76126a779c
commit 0e31abb9dc
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/mysql_install_db.sh
View File

@@ -189,12 +189,12 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
# #
# or default to compiled-in locations. # or default to compiled-in locations.
# #
if test -n "$srcdir" if test -n "$basedir"
then
print_defaults="$srcdir/extra/my_print_defaults"
elif test -n "$basedir"
then then
print_defaults=`find_in_basedir my_print_defaults bin extra` print_defaults=`find_in_basedir my_print_defaults bin extra`
elif test -n "$srcdir"
then
print_defaults="$srcdir/extra/my_print_defaults"
else else
print_defaults="@bindir@/my_print_defaults" print_defaults="@bindir@/my_print_defaults"
fi fi
@@ -211,22 +211,19 @@ parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
parse_arguments PICK-ARGS-FROM-ARGV "$@" parse_arguments PICK-ARGS-FROM-ARGV "$@"
# Configure paths to support files # Configure paths to support files
if test -n "$srcdir" if test -n "$basedir"
then
bindir="$basedir/bin"
extra_bindir="$bindir"
mysqld=`find_in_basedir mysqld libexec sbin bin sql`
pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
scriptdir="$basedir/scripts"
elif test -n "$srcdir"
then then
basedir="$srcdir" basedir="$srcdir"
bindir="$srcdir/client" bindir="$srcdir/client"
extra_bindir="$srcdir/extra" extra_bindir="$srcdir/extra"
mysqld="$srcdir/sql/mysqld" mysqld="$srcdir/sql/mysqld"
mysqld_opt="--language=$srcdir/sql/share/english"
pkgdatadir="$srcdir/scripts"
scriptdir="$srcdir/scripts"
elif test -n "$basedir"
then
bindir="$basedir/bin"
extra_bindir="$bindir"
mysqld=`find_in_basedir mysqld libexec sbin bin`
pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
scriptdir="$basedir/scripts"
else else
basedir="@prefix@" basedir="@prefix@"
bindir="@bindir@" bindir="@bindir@"
@@ -236,6 +233,13 @@ else
scriptdir="@scriptdir@" scriptdir="@scriptdir@"
fi fi
if test -n "$srcdir"
then
mysqld_opt="--language=$srcdir/sql/share/english"
pkgdatadir="$srcdir/scripts"
scriptdir="$srcdir/scripts"
fi
# Set up paths to SQL scripts required for bootstrap # Set up paths to SQL scripts required for bootstrap
fill_help_tables="$pkgdatadir/fill_help_tables.sql" fill_help_tables="$pkgdatadir/fill_help_tables.sql"
create_system_tables="$pkgdatadir/mysql_system_tables.sql" create_system_tables="$pkgdatadir/mysql_system_tables.sql"