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>
25 lines
664 B
Diff
25 lines
664 B
Diff
Don't guess basedir in mysql_config; we place it under _libdir because
|
|
of multilib conflicts, so use rather configured @prefix@ path directly.
|
|
|
|
---
|
|
scripts/mysql_config.sh | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
|
|
index 52f6d56..df63365 100644
|
|
--- a/scripts/mysql_config.sh
|
|
+++ b/scripts/mysql_config.sh
|
|
@@ -76,8 +76,7 @@ get_full_path ()
|
|
|
|
me=`get_full_path $0`
|
|
|
|
-# Script might have been renamed but assume mysql_<something>config<something>
|
|
-basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
|
|
+basedir='@prefix@'
|
|
|
|
ldata='@localstatedir@'
|
|
execdir='@libexecdir@'
|
|
--
|
|
1.9.1
|
|
|