You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
2.0 KiB
38 lines
2.0 KiB
Use configured value instead of hardcoded path |
|
|
|
diff -up mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.0.13/scripts/mysql_install_db.pl.in |
|
--- mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir 2014-09-04 12:50:24.061979080 +0200 |
|
+++ mariadb-10.0.13/scripts/mysql_install_db.pl.in 2014-09-04 12:51:22.929045559 +0200 |
|
@@ -318,7 +318,7 @@ elsif ( $opt->{basedir} ) |
|
find_in_basedir($opt,"file","mysqld-nt", |
|
"bin"); # ,"sql" |
|
$pkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql", |
|
- "share","share/mysql"); # ,"scripts" |
|
+ "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts" |
|
$scriptdir = "$opt->{basedir}/scripts"; |
|
} |
|
else |
|
diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/scripts/mysql_install_db.sh |
|
--- mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir 2014-09-04 12:51:59.005086301 +0200 |
|
+++ mariadb-10.0.13/scripts/mysql_install_db.sh 2014-09-04 12:54:02.794222597 +0200 |
|
@@ -280,16 +280,16 @@ 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 |
|
- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` |
|
+ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@` |
|
if test -z "$pkgdatadir" |
|
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"
|
|
|