MDEV-14953 - rename libmysqld.so to libmariadbd.so

MariaDB · Feb 8, 2018 · 6c5d364 · 6c5d364
1 parent bbdb47f
commit 6c5d364
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -1 +1 @@
-usr/lib/*/libmysqld.so.*
+usr/lib/*/libmariadbd.so.*
diff --git 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)