Deb: switch from usr/include/mysql to usr/include/mariadb

Matching libmariadb-dev package contents in official Debian repositories, the MariaDB Connector/C files should go into a folder using the 'mariadb' name. For compatibility with sources that expect to find 'mysql' stuff, create a symlink from include/mysql to include/mariadb.
ottok · Jan 11, 2018 · 6d26b0e · 6d26b0e
1 parent bf8440a
commit 6d26b0e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
@@ -176,7 +176,7 @@ SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/conf.d")
 SET(INSTALL_LIBDIR_DEB                  "lib")
 SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")
 #
-SET(INSTALL_INCLUDEDIR_DEB              "include/mysql")
+SET(INSTALL_INCLUDEDIR_DEB              "include/mariadb")
 #
 SET(INSTALL_DOCDIR_DEB                  "share/doc")
 SET(INSTALL_DOCREADMEDIR_DEB            "share/doc")

diff --git a/debian/libmariadb-dev-compat.links b/debian/libmariadb-dev-compat.links
@@ -1,2 +1,3 @@
 usr/bin/mariadb_config usr/bin/mysql_config
+usr/include/mariadb usr/include/mysql
 usr/share/pkgconfig/mariadb.pc usr/share/pkgconfig/mysqlclient.pc
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
@@ -1,5 +1,5 @@
 usr/bin/mariadb_config
-usr/include/mysql
+usr/include/mariadb
 usr/lib/*/libmariadb.so
 usr/lib/*/libmariadbclient.so
 usr/lib/*/libmariadbclient.a

diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links
@@ -1,2 +1 @@
-usr/include/mysql usr/include/mariadb
 usr/share/man/man1/mysql_config.1.gz usr/share/man/man1/mariadb_config.1.gz