diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-14 16:09:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-14 16:09:33 +0200 |
| commit | 9ee34f71333ea3b23b8ca8eb6744dfdb8042d082 (patch) | |
| tree | 13783a6767b0a76d623bb05712ace9a805c13404 | |
| parent | 2ae5c556a4400cfa59a940e19714fa81985f35b3 (diff) | |
| download | mariadb-git-9ee34f71333ea3b23b8ca8eb6744dfdb8042d082.tar.gz | |
install client plugins into their old location
| -rw-r--r-- | cmake/mariadb_connector_c.cmake | 2 | ||||
| -rw-r--r-- | debian/libmariadbclient18.files | 4 | ||||
| -rw-r--r-- | debian/mariadb-gssapi-client-10.2.files | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake index 5dc1b2ab2de..81abe0e5d45 100644 --- a/cmake/mariadb_connector_c.cmake +++ b/cmake/mariadb_connector_c.cmake @@ -47,5 +47,7 @@ ELSE() SET(CONC_INSTALL_LAYOUT "DEFAULT") ENDIF() +SET(PLUGIN_INSTALL_DIR ${INSTALL_PLUGINDIR}) + MESSAGE("== Configuring MariaDB Connector/C") ADD_SUBDIRECTORY(libmariadb) diff --git a/debian/libmariadbclient18.files b/debian/libmariadbclient18.files index b2b6d240a60..dfef3d26d0a 100644 --- a/debian/libmariadbclient18.files +++ b/debian/libmariadbclient18.files @@ -1,3 +1,3 @@ usr/lib/mariadb/libmariadb.so.* -usr/lib/mariadb/plugin/mysql_clear_password.so -usr/lib/mariadb/plugin/dialog.so +usr/lib/mysql/plugin/mysql_clear_password.so +usr/lib/mysql/plugin/dialog.so diff --git a/debian/mariadb-gssapi-client-10.2.files b/debian/mariadb-gssapi-client-10.2.files index 587694186f9..5a089e9352e 100644 --- a/debian/mariadb-gssapi-client-10.2.files +++ b/debian/mariadb-gssapi-client-10.2.files @@ -1 +1 @@ -usr/lib/mariadb/plugin/auth_gssapi_client.so +usr/lib/mysql/plugin/auth_gssapi_client.so |