1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff -uarN a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
--- a/scripts/mysql_install_db.pl.in 2017-07-10 06:53:28.000000000 -0400
+++ b/scripts/mysql_install_db.pl.in 2017-08-03 12:41:39.480556405 -0400
@@ -320,7 +320,7 @@
find_in_basedir($opt,"file","mysqld-nt",
"bin"); # ,"sql"
$srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
- "share","share/mysql"); # ,"scripts"
+ "@pkgdatadir@","share","share/mysql"); # ,"scripts"
$buildpkgdir = $srcpkgdatadir;
$scriptdir = "$opt->{basedir}/scripts";
}
diff -uarN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
--- a/scripts/mysql_install_db.sh 2017-07-10 06:53:28.000000000 -0400
+++ b/scripts/mysql_install_db.sh 2017-08-03 12:38:26.509073203 -0400
@@ -312,17 +312,17 @@
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 @pkgdatadir@/english share/english share/mysql/english`
if test -z "$langdir"
then
- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
+ cannot_find_file errmsg.sys $basedir/@pkgdatadir@/english $basedir/share/english $basedir/share/mysql/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 @pkgdatadir@ share share/mysql`
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/@pkgdatadir@ $basedir/share $basedir/share/mysql
exit 1
fi
scriptdir="$basedir/scripts"
|
GitWeb
