1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lp:886550 Wrong installation path for some include files.

Browse Source 
Now install all includes in a flat hierarchy under
$PREFIX/include/mysq/, same as 5.3. User can override with
-DINSTALL_INCLUDEDIR
This commit is contained in:
unknown 2012-04-03 08:00:57 +02:00
parent b00ee6e8e5
commit 34ed8f3379
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/install_layout.cmake
View File

@ -115,7 +115,7 @@ SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
SET(INSTALL_LIBDIR_STANDALONE "lib") SET(INSTALL_LIBDIR_STANDALONE "lib")
SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin")
# #
SET(INSTALL_INCLUDEDIR_STANDALONE "include") SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql")
# #
SET(INSTALL_DOCDIR_STANDALONE "docs") SET(INSTALL_DOCDIR_STANDALONE "docs")
SET(INSTALL_DOCREADMEDIR_STANDALONE ".") SET(INSTALL_DOCREADMEDIR_STANDALONE ".")
@ -198,7 +198,7 @@ SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
SET(INSTALL_LIBDIR_SVR4 "lib") SET(INSTALL_LIBDIR_SVR4 "lib")
SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin") SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
# #
SET(INSTALL_INCLUDEDIR_SVR4 "include") SET(INSTALL_INCLUDEDIR_SVR4 "include/mysql")
# #
SET(INSTALL_DOCDIR_SVR4 "docs") SET(INSTALL_DOCDIR_SVR4 "docs")
SET(INSTALL_DOCREADMEDIR_SVR4 ".") SET(INSTALL_DOCREADMEDIR_SVR4 ".")

2
debian/dist/Debian/rules vendored
View File

@ -169,8 +169,6 @@ install: build
# libmysqlclient-dev: forgotten header file since 3.23.25? # libmysqlclient-dev: forgotten header file since 3.23.25?
cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
cp include/my_dir.h $(TMP)/usr/include/mysql/ cp include/my_dir.h $(TMP)/usr/include/mysql/
mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/
mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/
# mysql-common: We provide our own version of this package for # mysql-common: We provide our own version of this package for
# completeness, but we can use an existing version; mariadb-specic # completeness, but we can use an existing version; mariadb-specic

2
debian/dist/Ubuntu/rules vendored
View File

@ -169,8 +169,6 @@ install: build
# libmysqlclient-dev: forgotten header file since 3.23.25? # libmysqlclient-dev: forgotten header file since 3.23.25?
cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
cp include/my_dir.h $(TMP)/usr/include/mysql/ cp include/my_dir.h $(TMP)/usr/include/mysql/
mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/
mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/
# mysql-common: We provide our own version of this package for # mysql-common: We provide our own version of this package for
# completeness, but we can use an existing version; mariadb-specic # completeness, but we can use an existing version; mariadb-specic

14
include/CMakeLists.txt
View File

@ -20,22 +20,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h
${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
${CMAKE_CURRENT_BINARY_DIR}/sql_state.h ${CMAKE_CURRENT_BINARY_DIR}/sql_state.h
) )
SET(HEADERS_ABI
SET(HEADERS
mysql.h mysql.h
mysql_com.h mysql_com.h
mysql_time.h mysql_time.h
my_list.h my_list.h
my_alloc.h my_alloc.h
typelib.h typelib.h
mysql/plugin.h
mysql/plugin_audit.h
mysql/plugin_ftparser.h
mysql/plugin_auth.h
mysql/client_plugin.h
)
SET(HEADERS
${HEADERS_ABI}
my_dbug.h my_dbug.h
m_string.h m_string.h
my_sys.h my_sys.h
@ -61,4 +53,4 @@ SET(HEADERS
) )
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")