From 257d7b776adcf93f26807b887f97f529179c37a1 Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Wed, 29 Oct 2014 10:16:16 +0100 Subject: [PATCH] Install the agent lib to non arch specific directory https://fedorahosted.org/fesco/ticket/961 --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33a5e03..316ce8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,8 +43,8 @@ if(NOT BIN_INSTALL_DIR) set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) endif() -if(NOT LIB_INSTALL_DIR) - set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) +if(NOT JNIAGENTLIB_INSTALL_DIR) + set(JNIAGENTLIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}) endif() if(NOT SYSCONF_INSTALL_DIR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d084401..e3e421b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,4 +20,4 @@ set_target_properties( target_link_libraries(AbrtChecker ${PC_LIBREPORT_LIBRARIES}) target_link_libraries(AbrtChecker ${PC_JOURNALD_LIBRARIES}) -install(TARGETS AbrtChecker DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS AbrtChecker DESTINATION ${JNIAGENTLIB_INSTALL_DIR}) -- 1.8.3.1