From fac3ff4366d9eb0c71a945abf08e6a8b72c583a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 13 Jan 2021 13:54:28 +0200
Subject: [PATCH] MXS-3346: Fix tarball plugin directory

The plugin directory wasn't installed and using --basedir with a path to
the extracted tarball wouldn't be enough.
---
 cmake/install_layout.cmake | 4 ++--
 cmake/package_tgz.cmake    | 1 +
 server/core/gateway.cc     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 8cbacf97b..a304ec604 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -23,7 +23,7 @@ set(DEFAULT_EXEC_SUBPATH "${MAXSCALE_BINDIR}" CACHE PATH "Default executable sub
 set(DEFAULT_CONFIG_SUBPATH "etc" CACHE PATH "Default configuration subpath")
 set(DEFAULT_CONFIG_PERSIST_SUBPATH "maxscale.cnf.d" CACHE PATH "Default persisted configuration subpath")
 set(DEFAULT_MODULE_CONFIG_SUBPATH "${DEFAULT_CONFIG_SUBPATH}/maxscale.modules.d" CACHE PATH "Default configuration subpath")
-set(DEFAULT_CONNECTOR_PLUGIN_SUBPATH "/mysql/plugin" CACHE PATH "Default connector plugin subpath")
+set(DEFAULT_CONNECTOR_PLUGIN_SUBPATH "${CMAKE_INSTALL_LIBDIR}/mysql/plugin" CACHE PATH "Default connector plugin subpath")
 
 set(DEFAULT_PIDDIR ${MAXSCALE_VARDIR}/${DEFAULT_PID_SUBPATH} CACHE PATH "Default PID file directory")
 set(DEFAULT_MAXADMIN_SOCKET ${DEFAULT_PIDDIR}/${DEFAULT_MAXADMIN_SOCKET_FILE} CACHE PATH "Default MaxAdmin socket path")
@@ -36,7 +36,7 @@ set(DEFAULT_EXECDIR ${CMAKE_INSTALL_PREFIX}/${DEFAULT_EXEC_SUBPATH} CACHE PATH "
 set(DEFAULT_CONFIGDIR /${DEFAULT_CONFIG_SUBPATH} CACHE PATH "Default configuration directory")
 set(DEFAULT_CONFIG_PERSISTDIR ${DEFAULT_DATADIR}/${DEFAULT_CONFIG_PERSIST_SUBPATH} CACHE PATH "Default persisted configuration directory")
 set(DEFAULT_MODULE_CONFIGDIR /${DEFAULT_MODULE_CONFIG_SUBPATH} CACHE PATH "Default module configuration directory")
-set(DEFAULT_CONNECTOR_PLUGINDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${DEFAULT_CONNECTOR_PLUGIN_SUBPATH} CACHE PATH "Default connector plugin directory")
+set(DEFAULT_CONNECTOR_PLUGINDIR ${CMAKE_INSTALL_PREFIX}/${DEFAULT_CONNECTOR_PLUGIN_SUBPATH} CACHE PATH "Default connector plugin directory")
 
 # Massage TARGET_COMPONENT into a list
 if (TARGET_COMPONENT)
diff --git a/cmake/package_tgz.cmake b/cmake/package_tgz.cmake
index 65aa4177f..7f16585c7 100644
--- a/cmake/package_tgz.cmake
+++ b/cmake/package_tgz.cmake
@@ -25,6 +25,7 @@ install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxs
 install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxscale/maxscale.cnf.d)
 install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION etc/maxscale.modules.d)
 install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/plugin)
+install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION ${DEFAULT_CONNECTOR_PLUGIN_SUBPATH})
 
 if(DISTRIB_SUFFIX)
   set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}")
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index a29b43a8e..dfe4fcdc9 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -1403,7 +1403,7 @@ bool set_runtime_dirs(const char* basedir)
 
     if (rv && (rv = handle_path_arg(&path,
                                     basedir,
-                                    "var/" MXS_DEFAULT_CONNECTOR_PLUGIN_SUBPATH,
+                                    MXS_DEFAULT_CONNECTOR_PLUGIN_SUBPATH,
                                     true,
                                     false)))
     {