mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug#51925: 5.5 installed header file layout is incorrect

Browse source 
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.
This commit is contained in:
Jonathan Perkin 2010-12-17 23:08:43 +00:00
parent b1b89865c6
commit 30cfda089f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/CMakeLists.txt
View file

@ -59,6 +59,4 @@ SET(HEADERS
)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")

6
scripts/mysql_config.sh
View file

@ -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@'