database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-19208 mariadb.pc: install into libdir

Browse Source 
The .pc file installed by mariadb mentions archful directories and
therefore must be archful itself.

This fixes MDEV-14340.
This commit is contained in:
Vicențiu Ciorbaru
2020-02-26 13:46:27 +02:00
parent da10c6f448
commit c5c1027c6e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/libmariadb-dev.install vendored
View File

@@ -5,5 +5,5 @@ usr/lib/*/libmysqlclient.so
usr/lib/*/libmariadbclient.so usr/lib/*/libmariadbclient.so
usr/lib/*/libmariadbclient.a usr/lib/*/libmariadbclient.a
usr/lib/*/libmysqlservices.a usr/lib/*/libmysqlservices.a
usr/lib/*/pkgconfig/mariadb.pc
usr/share/aclocal/mysql.m4 usr/share/aclocal/mysql.m4
usr/share/pkgconfig/mariadb.pc

2
support-files/CMakeLists.txt
View File

@@ -100,7 +100,7 @@ IF(UNIX)
ENDIF() ENDIF()
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)