diff options
| author | unknown <kent@mysql.com> | 2006-03-29 15:05:06 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-29 15:05:06 +0200 |
| commit | 16fa54bf746e8642c0563b8f3204121e27795364 (patch) | |
| tree | bfb5bffba1091fea658609720177e2c7146007e5 /scripts | |
| parent | cc85b178afedc4ce21bb02e6918ec3ef2231d4c3 (diff) | |
| parent | 0fb36d1b1e665b424492674aec283de852a1296a (diff) | |
| download | mariadb-git-16fa54bf746e8642c0563b8f3204121e27795364.tar.gz | |
Merge
sql/field.cc:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_config.sh | 7 |
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@' |