diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-08 12:02:49 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-08 12:02:49 +0000 |
| commit | 6c5d364956a399eed40b56f7aa5a7a8c56c5708c (patch) | |
| tree | bb8ad7096391b5147a0b1de4d2b01cc7ec684a27 | |
| parent | bbdb47ffe49522a2d639206e6ff3be719d6eadb3 (diff) | |
| download | mariadb-git-6c5d364956a399eed40b56f7aa5a7a8c56c5708c.tar.gz | |
MDEV-14953 - rename libmysqld.so to libmariadbd.so
| -rw-r--r-- | debian/libmariadbd-dev.install | 2 | ||||
| -rw-r--r-- | debian/libmariadbd19.install | 2 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install index 4608bf6e838..2c14af5ab31 100644 --- a/debian/libmariadbd-dev.install +++ b/debian/libmariadbd-dev.install @@ -1,2 +1,4 @@ usr/lib/*/libmysqld.a +usr/lib/*/libmariadbd.a usr/lib/*/libmysqld.so +usr/lib/*/libmariadbd.so diff --git a/debian/libmariadbd19.install b/debian/libmariadbd19.install index fb5f4771734..cb627204432 100644 --- a/debian/libmariadbd19.install +++ b/debian/libmariadbd19.install @@ -1 +1 @@ -usr/lib/*/libmysqld.so.* +usr/lib/*/libmariadbd.so.* diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 933f8353afc..718e832edef 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -138,7 +138,7 @@ IF(WIN32) SET(COMPONENT_MYSQLSERVER "Embedded") SET(COMPONENT_LIBMYSQLD "Embedded") ELSE() - SET(MYSQLSERVER_OUTPUT_NAME mysqld) + SET(MYSQLSERVER_OUTPUT_NAME mariadbd) SET(COMPONENT_MYSQLSERVER "Development") SET(COMPONENT_LIBMYSQLD "Server") ENDIF() @@ -166,7 +166,9 @@ ENDFOREACH() MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER}) - +IF(UNIX) + INSTALL_SYMLINK(libmysqld.a mysqlserver ${INSTALL_LIBDIR} ${COMPONENT_MYSQLSERVER}) +ENDIF() INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT ${COMPONENT_MYSQLSERVER}) @@ -438,8 +440,9 @@ IF(NOT DISABLE_SHARED) # Name the shared library, handle versioning (provides same api as client # library hence the same version) SET_TARGET_PROPERTIES(libmysqld PROPERTIES - OUTPUT_NAME mysqld + OUTPUT_NAME mariadbd SOVERSION "${SHARED_LIB_MAJOR_VERSION}") + INSTALL_SYMLINK(libmysqld.so libmysqld ${INSTALL_LIBDIR} ${COMPONENT_LIBMYSQLD}) # Clean direct output flags, as 2 targets have the same base name # libmysqld SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) |