summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2023-02-11 20:04:46 +0100
committerSergei Golubchik <serg@mariadb.org>2023-02-12 12:15:22 +0100
commit9656356b550079234185f430fe6b4190f435f3e6 (patch)
tree46aa715ae0ad1df315e4f28ee1b29ef0e1380046 /scripts
parent36ea5dffe708237cc1f714feda805cc203fe6d41 (diff)
downloadmariadb-git-9656356b550079234185f430fe6b4190f435f3e6.tar.gz
MDEV-30203 Move mysql symlinks to different package
For both Deb and RPM, create mariadb-client-compat and mariadb-server-compat containing the mysql links to the mariadb named executables/scripts. The mariadb-client-core mysqlcheck was moved to mariadb-client-compat. The symlinks in MYSQL_ADD_EXECUTABLE is tagged as a {Client,Server}Symlinks component and placed in the symlinks packages. Man pages are restructured be installed into compat package if that matches the executable. Columnstore has a workaround as it doesn't use the cmake/plugin.cmake. Scripts likewise have compatibility symlinks are in the {server,client}-compat packages. Co-author: Andrew Hutchings <andrew@linuxjedi.co.uk> Closes #2390
Diffstat (limited to 'scripts')
-rw-r--r--scripts/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9eec793c9fb..7f9c92f1cf2 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -223,7 +223,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
DESTINATION ${INSTALL_SCRIPTDIR}
COMPONENT Server)
- INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} Server)
+ INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} ServerSymlinks)
ENDIF()
SET(prefix "${CMAKE_INSTALL_PREFIX}")
@@ -385,7 +385,7 @@ ELSE()
# Create symlink
IF (NOT ${binname} STREQUAL ${file})
- INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
+ INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT}Symlinks)
ENDIF()
ENDFOREACH()
ENDIF()