lp:886550 Wrong installation path for some include files.

Now install all includes in a flat hierarchy under
$PREFIX/include/mysq/, same as 5.3. User can override with
-DINSTALL_INCLUDEDIR

4 files changed, 5 insertions, 17 deletions

diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 38d3fd3d01e..76e78e8b72f 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -115,7 +115,7 @@ SET(INSTALL_SCRIPTDIR_STANDALONE        "scripts")
 SET(INSTALL_LIBDIR_STANDALONE           "lib")
 SET(INSTALL_PLUGINDIR_STANDALONE        "lib/plugin")
 #
-SET(INSTALL_INCLUDEDIR_STANDALONE       "include")
+SET(INSTALL_INCLUDEDIR_STANDALONE       "include/mysql")
 #
 SET(INSTALL_DOCDIR_STANDALONE           "docs")
 SET(INSTALL_DOCREADMEDIR_STANDALONE     ".")
@@ -198,7 +198,7 @@ SET(INSTALL_SCRIPTDIR_SVR4              "scripts")
 SET(INSTALL_LIBDIR_SVR4                 "lib")
 SET(INSTALL_PLUGINDIR_SVR4              "lib/plugin")
 #
-SET(INSTALL_INCLUDEDIR_SVR4             "include")
+SET(INSTALL_INCLUDEDIR_SVR4             "include/mysql")
 #
 SET(INSTALL_DOCDIR_SVR4                 "docs")
 SET(INSTALL_DOCREADMEDIR_SVR4           ".")
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 457502882c4..5cb22ae60d6 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -169,8 +169,6 @@ install: build
 	# libmysqlclient-dev: forgotten header file since 3.23.25?
 	cp $(BUILDDIR)/include/my_config.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
 	# completeness, but we can use an existing version; mariadb-specic
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 69e1cba2893..592b2e4d7d1 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -169,8 +169,6 @@ install: build
 	# libmysqlclient-dev: forgotten header file since 3.23.25?
 	cp $(BUILDDIR)/include/my_config.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
 	# completeness, but we can use an existing version; mariadb-specic
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 052df5d3276..3046c3f7614 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -20,22 +20,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h
 ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
 ${CMAKE_CURRENT_BINARY_DIR}/sql_state.h
 )
-SET(HEADERS_ABI 
+
+SET(HEADERS 
   mysql.h 
   mysql_com.h
   mysql_time.h 
   my_list.h
   my_alloc.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 
   m_string.h
   my_sys.h 
@@ -61,4 +53,4 @@ SET(HEADERS
 )
 
 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")