Skip to content

Commit

Permalink
MDEV-19208 mariadb.pc: install into libdir
Browse files Browse the repository at this point in the history
The .pc file installed by mariadb mentions archful directories and
therefore must be archful itself.

This fixes MDEV-14340.
  • Loading branch information
cvicentiu committed Mar 5, 2020
1 parent da10c6f commit c5c1027
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion debian/libmariadb-dev.install
Expand Up @@ -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
2 changes: 1 addition & 1 deletion support-files/CMakeLists.txt
Expand Up @@ -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)

Expand Down

0 comments on commit c5c1027

Please sign in to comment.