diff options
| -rw-r--r-- | include/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 5334fc0f5ae..e89929d159d 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -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") 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@' |