| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 36d87919223db9b054862ad38cdda8d9222a2bab Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 30 Dec 2016 18:04:35 +0200 |
| 4 | Subject: [PATCH 1/4] Correctly set the library installation directory |
| 5 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame^] | 6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/110] |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 8 | --- |
| 9 | librepo/CMakeLists.txt | 3 ++- |
| 10 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 11 | |
| 12 | diff --git a/librepo/CMakeLists.txt b/librepo/CMakeLists.txt |
| 13 | index 2fe76d8..5026def 100644 |
| 14 | --- a/librepo/CMakeLists.txt |
| 15 | +++ b/librepo/CMakeLists.txt |
| 16 | @@ -60,7 +60,8 @@ CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY) |
| 17 | IF (CMAKE_SIZEOF_VOID_P MATCHES "8") |
| 18 | SET (LIB_SUFFIX "64") |
| 19 | ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") |
| 20 | -SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") |
| 21 | +#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") |
| 22 | +SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") |
| 23 | |
| 24 | INSTALL(FILES ${librepo_HEADERS} DESTINATION include/librepo) |
| 25 | INSTALL(TARGETS librepo LIBRARY DESTINATION ${LIB_INSTALL_DIR}) |
| 26 | -- |
| 27 | 2.11.0 |
| 28 | |