32e03b2cdd
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: Ibc2ad09bef7a7f40e337513a1694a22f38d7f4e9
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
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
|
|
|