File tree Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Expand file tree Collapse file tree 3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 11usr/lib/*/libmysqld.a
2+ usr/lib/*/libmariadbd.a
23usr/lib/*/libmysqld.so
4+ usr/lib/*/libmariadbd.so
Original file line number Diff line number Diff line change 1- usr/lib/*/libmysqld .so.*
1+ usr/lib/*/libmariadbd .so.*
Original file line number Diff line number Diff line change @@ -138,7 +138,7 @@ IF(WIN32)
138138 SET (COMPONENT_MYSQLSERVER "Embedded" )
139139 SET (COMPONENT_LIBMYSQLD "Embedded" )
140140ELSE ()
141- SET (MYSQLSERVER_OUTPUT_NAME mysqld )
141+ SET (MYSQLSERVER_OUTPUT_NAME mariadbd )
142142 SET (COMPONENT_MYSQLSERVER "Development" )
143143 SET (COMPONENT_LIBMYSQLD "Server" )
144144ENDIF ()
@@ -166,7 +166,9 @@ ENDFOREACH()
166166
167167MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
168168 OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER} )
169-
169+ IF (UNIX )
170+ INSTALL_SYMLINK(libmysqld.a mysqlserver ${INSTALL_LIBDIR} ${COMPONENT_MYSQLSERVER} )
171+ ENDIF ()
170172INSTALL (FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR} /server/private COMPONENT ${COMPONENT_MYSQLSERVER} )
171173
172174
@@ -438,8 +440,9 @@ IF(NOT DISABLE_SHARED)
438440 # Name the shared library, handle versioning (provides same api as client
439441 # library hence the same version)
440442 SET_TARGET_PROPERTIES (libmysqld PROPERTIES
441- OUTPUT_NAME mysqld
443+ OUTPUT_NAME mariadbd
442444 SOVERSION "${SHARED_LIB_MAJOR_VERSION} " )
445+ INSTALL_SYMLINK(libmysqld.so libmysqld ${INSTALL_LIBDIR} ${COMPONENT_LIBMYSQLD} )
443446 # Clean direct output flags, as 2 targets have the same base name
444447 # libmysqld
445448 SET_TARGET_PROPERTIES (libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
You can’t perform that action at this time.
0 commit comments