From c5c1027c6eb0db9738c231731b664f9736970d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Wed, 26 Feb 2020 13:46:27 +0200 Subject: [PATCH] MDEV-19208 mariadb.pc: install into libdir The .pc file installed by mariadb mentions archful directories and therefore must be archful itself. This fixes MDEV-14340. --- debian/libmariadb-dev.install | 2 +- support-files/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index e62aad1b43f..856cdacfd95 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -5,5 +5,5 @@ usr/lib/*/libmysqlclient.so usr/lib/*/libmariadbclient.so usr/lib/*/libmariadbclient.a usr/lib/*/libmysqlservices.a +usr/lib/*/pkgconfig/mariadb.pc usr/share/aclocal/mysql.m4 -usr/share/pkgconfig/mariadb.pc diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 92a46b7b12a..038e7163901 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -100,7 +100,7 @@ IF(UNIX) ENDIF() 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)