|
 |
4b4994 |
Use configured value instead of hardcoded path
|
|
|
4b4994 |
|
|
|
91ce7b |
diff -up mariadb-10.1.19/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.1.19/scripts/mysql_install_db.pl.in
|
|
|
91ce7b |
--- mariadb-10.1.19/scripts/mysql_install_db.pl.in.pbasedir 2016-11-19 13:08:53.882777759 +0100
|
|
|
91ce7b |
+++ mariadb-10.1.19/scripts/mysql_install_db.pl.in 2016-11-19 13:08:53.880777758 +0100
|
|
|
91ce7b |
@@ -306,7 +306,7 @@ if ( $opt->{srcdir} )
|
|
|
91ce7b |
$bindir = "$opt->{basedir}/client";
|
|
|
91ce7b |
$extra_bindir = "$opt->{basedir}/extra";
|
|
|
91ce7b |
$mysqld = "$opt->{basedir}/sql/mysqld";
|
|
|
91ce7b |
- $mysqld_opt = "--language=$opt->{srcdir}/sql/share/english";
|
|
|
91ce7b |
+ $mysqld_opt = "--language=$opt->{srcdir}/sql/@INSTALL_MYSQLSHAREDIR@/english";
|
|
|
91ce7b |
$srcpkgdatadir = "$opt->{srcdir}/scripts";
|
|
|
91ce7b |
$buildpkgdatadir = "$opt->{builddir}/scripts";
|
|
|
91ce7b |
$scriptdir = "$opt->{srcdir}/scripts";
|
|
|
91ce7b |
@@ -320,7 +320,7 @@ elsif ( $opt->{basedir} )
|
|
|
4b4994 |
find_in_basedir($opt,"file","mysqld-nt",
|
|
|
4b4994 |
"bin"); # ,"sql"
|
|
|
91ce7b |
$srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
|
|
|
4b4994 |
- "share","share/mysql"); # ,"scripts"
|
|
|
4b4994 |
+ "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts"
|
|
|
91ce7b |
$buildpkgdir = $srcpkgdatadir;
|
|
|
4b4994 |
$scriptdir = "$opt->{basedir}/scripts";
|
|
|
4b4994 |
}
|