|
 |
8ddd42 |
Use configured value instead of hardcoded path
|
|
|
8ddd42 |
|
|
|
8ddd42 |
diff -up mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.0.13/scripts/mysql_install_db.pl.in
|
|
|
8ddd42 |
--- mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir 2014-09-04 12:50:24.061979080 +0200
|
|
|
8ddd42 |
+++ mariadb-10.0.13/scripts/mysql_install_db.pl.in 2014-09-04 12:51:22.929045559 +0200
|
|
|
8ddd42 |
@@ -318,7 +318,7 @@ elsif ( $opt->{basedir} )
|
|
|
8ddd42 |
find_in_basedir($opt,"file","mysqld-nt",
|
|
|
8ddd42 |
"bin"); # ,"sql"
|
|
|
8ddd42 |
$pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
|
|
|
8ddd42 |
- "share","share/mysql"); # ,"scripts"
|
|
|
8ddd42 |
+ "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts"
|
|
|
8ddd42 |
$scriptdir = "$opt->{basedir}/scripts";
|
|
|
8ddd42 |
}
|
|
|
8ddd42 |
else
|
|
|
8ddd42 |
diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/scripts/mysql_install_db.sh
|
|
|
8ddd42 |
--- mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir 2014-09-04 12:51:59.005086301 +0200
|
|
|
8ddd42 |
+++ mariadb-10.0.13/scripts/mysql_install_db.sh 2014-09-04 12:54:02.794222597 +0200
|
|
|
8ddd42 |
@@ -280,16 +280,16 @@ then
|
|
|
8ddd42 |
cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
|
|
|
8ddd42 |
exit 1
|
|
|
8ddd42 |
fi
|
|
|
8ddd42 |
- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
|
|
|
8ddd42 |
+ langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english`
|
|
|
8ddd42 |
if test -z "$langdir"
|
|
|
8ddd42 |
then
|
|
|
8ddd42 |
- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
|
|
|
8ddd42 |
+ cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english
|
|
|
8ddd42 |
exit 1
|
|
|
8ddd42 |
fi
|
|
|
8ddd42 |
- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
|
|
|
8ddd42 |
+ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
|
|
|
8ddd42 |
if test -z "$pkgdatadir"
|
|
|
8ddd42 |
then
|
|
|
8ddd42 |
- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
|
|
|
8ddd42 |
+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@
|
|
|
8ddd42 |
exit 1
|
|
|
8ddd42 |
fi
|
|
|
8ddd42 |
scriptdir="$basedir/scripts"
|