Use configured value instead of hardcoded path --- scripts/mysql_install_db.pl.in | 2 +- scripts/mysql_install_db.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 9d2c1f6..0accdd1 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -320,7 +320,7 @@ elsif ( $opt->{basedir} ) find_in_basedir($opt,"file","mysqld-nt", "bin"); # ,"sql" $srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql", - "share","share/mysql"); # ,"scripts" + "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts" $buildpkgdir = $srcpkgdatadir; $scriptdir = "$opt->{basedir}/scripts"; } diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 364cc4f..eaa7a89 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -311,17 +311,17 @@ then cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin exit 1 fi - langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` + langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english` if test -z "$langdir" then - cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english + cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english exit 1 fi - srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` + srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@` buildpkgdatadir=$srcpkgdatadir if test -z "$srcpkgdatadir" then - cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql + cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@ exit 1 fi scriptdir="$basedir/scripts" -- 1.9.1