diff options
author | Otto Kekäläinen <otto@mariadb.org> | 2018-01-11 20:04:09 +0000 |
---|---|---|
committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2018-01-16 13:48:00 +0200 |
commit | ed00fd2bced5a7d52e3a26f95aa8acdb45eb49da (patch) | |
tree | 90ddbb646aaeebefc3adf5d70eb5d701b13151e5 | |
parent | 5b3bf57be251929e2a7e32ab4499559934c6ccbe (diff) | |
download | mariadb-git-ed00fd2bced5a7d52e3a26f95aa8acdb45eb49da.tar.gz |
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.
-rw-r--r-- | cmake/install_layout.cmake | 2 | ||||
-rw-r--r-- | debian/libmariadb-dev-compat.links | 1 | ||||
-rw-r--r-- | debian/libmariadb-dev.install | 2 | ||||
-rw-r--r-- | debian/libmariadb-dev.links | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 5484691e94a..63e2419951b 100644 --- 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 index 50798417681..11e0dbce225 100644 --- 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 index ae26a1e10e9..5025ae4a47c 100644 --- 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 index 14d60027b8a..6a7bf707ca7 100644 --- 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 |