From 0e31abb9dc57aab71975c73c28f31d9c3ee8727a Mon Sep 17 00:00:00 2001
From: unknown <df@pippilotta.erinye.com>
Date: Fri, 23 Nov 2007 13:38:59 +0100
Subject: Fix make distcheck.

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.
---
 scripts/mysql_install_db.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 260c372c802..798dbf60acd 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -189,12 +189,12 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
 #
 # or default to compiled-in locations.
 #
-if test -n "$srcdir"
-then
-  print_defaults="$srcdir/extra/my_print_defaults"
-elif test -n "$basedir"
+if test -n "$basedir"
 then
   print_defaults=`find_in_basedir my_print_defaults bin extra`
+elif test -n "$srcdir" 
+then
+  print_defaults="$srcdir/extra/my_print_defaults"
 else
   print_defaults="@bindir@/my_print_defaults"
 fi
@@ -211,22 +211,19 @@ parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 # Configure paths to support files
-if test -n "$srcdir"
-then
-  basedir="$srcdir"
-  bindir="$srcdir/client"
-  extra_bindir="$srcdir/extra"
-  mysqld="$srcdir/sql/mysqld"
-  mysqld_opt="--language=$srcdir/sql/share/english"
-  pkgdatadir="$srcdir/scripts"
-  scriptdir="$srcdir/scripts"
-elif test -n "$basedir"
+if test -n "$basedir"
 then
   bindir="$basedir/bin"
   extra_bindir="$bindir"
-  mysqld=`find_in_basedir mysqld libexec sbin bin`
+  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
+  basedir="$srcdir"
+  bindir="$srcdir/client"
+  extra_bindir="$srcdir/extra"
+  mysqld="$srcdir/sql/mysqld"
 else
   basedir="@prefix@"
   bindir="@bindir@"
@@ -236,6 +233,13 @@ else
   scriptdir="@scriptdir@"
 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
 fill_help_tables="$pkgdatadir/fill_help_tables.sql"
 create_system_tables="$pkgdatadir/mysql_system_tables.sql"
-- 
cgit v1.2.1