From d8951d4b87bc7a2fb78759303a43be24d1f1d713 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 27 Aug 2014 12:56:49 +0200 Subject: [PATCH] Install the .pc file in the arch-dependent folder If phoned is built on a non-x86 device, the installation lib folder may not be "/usr/lib" ("/usr/lib64" e.g.). Fix that in the CMake build file. Change-Id: Ie7549396b2d8c339ce11dbb59c8dad1f3e0f48fd Signed-off-by: Manuel Bachmann --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b8292b..f309d6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ SET(CMAKE_INSTALL_PREFIX "/usr") # Required platform modules # ----------------------------------------------------------------------------- INCLUDE(FindPkgConfig) +INCLUDE(GNUInstallDirs) PKG_CHECK_MODULES(glib REQUIRED glib-2.0) PKG_CHECK_MODULES(gio REQUIRED gio-2.0) @@ -76,7 +77,7 @@ SET(PKGCONFIG_DIR ${CMAKE_SOURCE_DIR}/pkgconfig) MACRO(configure_and_install_pkg PKG_FILE) CONFIGURE_FILE(${PKGCONFIG_DIR}/${PKG_FILE}.in ${PKGCONFIG_DIR}/${PKG_FILE} @ONLY) - INSTALL(FILES ${PKGCONFIG_DIR}/${PKG_FILE} DESTINATION lib/pkgconfig) + INSTALL(FILES ${PKGCONFIG_DIR}/${PKG_FILE} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ENDMACRO(configure_and_install_pkg) SET(TARGET_NAME phoned) -- 2.7.4