diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-12-17 23:08:43 +0000 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-12-17 23:08:43 +0000 |
| commit | 30cfda089fdbeb2915c35e0609984189a9855b73 (patch) | |
| tree | 36ae6bd4871f972411c3f1c11d347b0c6bdafe9a /scripts/mysql_config.sh | |
| parent | b1b89865c6ee1ccf919642aa4ea275f68866dae9 (diff) | |
| download | mariadb-git-30cfda089fdbeb2915c35e0609984189a9855b73.tar.gz | |
bug#51925: 5.5 installed header file layout is incorrect
The 'mysql' include sub-directory was copied directly into
include/ rather than retaining its own directory.
Fix this, and update mysql_config which needs additional
logic to detect the correct prefix for includes.
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 69ec88d6724..97a8a723043 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,7 +92,11 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"` fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin pkgincludedir='@pkgincludedir@' -fix_path pkgincludedir include/mysql include +if [ -f $basedir/include/mysql/mysql.h ]; then + pkgincludedir="$basedir/include/mysql" +elif [ -f $basedir/include/mysql.h ]; then + pkgincludedir="$basedir/include" +fi version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' |