summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorkent@mysql.com <>2006-03-29 15:05:06 +0200
committerkent@mysql.com <>2006-03-29 15:05:06 +0200
commit0d332aef3911cd04a2e225d2dbfa262f0d881424 (patch)
treebfb5bffba1091fea658609720177e2c7146007e5 /scripts
parent37b916a7284a41b6fcbe6d3eef7b11d61c4c238a (diff)
parent67f2b0f3bc1a074609ee2f8470bf24dd926e73a7 (diff)
downloadmariadb-git-0d332aef3911cd04a2e225d2dbfa262f0d881424.tar.gz
Merge
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_config.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 4d732485b1d..84ff518c381 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -82,10 +82,15 @@ basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
ldata='@localstatedir@'
execdir='@libexecdir@'
bindir='@bindir@'
+
+# If installed, search for the compiled in directory first (might be "lib64")
pkglibdir='@pkglibdir@'
-fix_path pkglibdir lib/mysql lib
+pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+
pkgincludedir='@pkgincludedir@'
fix_path pkgincludedir include/mysql include
+
version='@VERSION@'
socket='@MYSQL_UNIX_ADDR@'
port='@MYSQL_TCP_PORT@'