[Commits] Rev 3360: lp:886550 Wrong installation path for some include files. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Apr 2 18:36:31 EEST 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3360
revision-id: knielsen at knielsen-hq.org-20120402153631-n3g5k4vkppdm7vu3
parent: monty at askmonty.org-20120402103316-hjw54rsg5idb18vc
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Mon 2012-04-02 17:36:31 +0200
message:
  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
=== modified file 'cmake/install_layout.cmake'
--- a/cmake/install_layout.cmake	2012-01-23 11:20:16 +0000
+++ b/cmake/install_layout.cmake	2012-04-02 15:36:31 +0000
@@ -115,7 +115,7 @@ SET(INSTALL_SCRIPTDIR_STANDALONE
 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
 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           ".")

=== modified file 'debian/dist/Debian/rules'
--- a/debian/dist/Debian/rules	2012-02-06 12:30:39 +0000
+++ b/debian/dist/Debian/rules	2012-04-02 15:36:31 +0000
@@ -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

=== modified file 'debian/dist/Ubuntu/rules'
--- a/debian/dist/Ubuntu/rules	2012-01-28 20:22:14 +0000
+++ b/debian/dist/Ubuntu/rules	2012-04-02 15:36:31 +0000
@@ -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

=== modified file 'include/CMakeLists.txt'
--- a/include/CMakeLists.txt	2011-12-02 15:29:02 +0000
+++ b/include/CMakeLists.txt	2012-04-02 15:36:31 +0000
@@ -20,6 +20,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/mysqld_ernam
 ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
 ${CMAKE_CURRENT_BINARY_DIR}/sql_state.h
 )
+# ToDo: I am not sure why ABI headers are separated out like this.
+# This separation makes us install ABI headers that are below include/mysql/
+# two times on top of each other (see below).
+# This is not harmful, but slightly ugly.
+# Maybe HEADERS_ABI could just be removed, since it appears unused ...
 SET(HEADERS_ABI 
   mysql.h 
   mysql_com.h
@@ -61,4 +66,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")



More information about the commits mailing list