Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 8d29879fe3606c78769c1bcdddf0bcfc7191c710 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 30 Dec 2016 18:20:01 +0200 |
| 4 | Subject: [PATCH 3/4] Set the library installation directory correctly. |
| 5 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 8 | --- |
| 9 | CMakeLists.txt | 4 +++- |
| 10 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 11 | |
| 12 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 13 | index d35f0d7..8edb627 100644 |
| 14 | --- a/CMakeLists.txt |
| 15 | +++ b/CMakeLists.txt |
| 16 | @@ -62,7 +62,9 @@ ADD_DEFINITIONS(-DPACKAGE_VERSION=\\"${LIBDNF_VERSION}\\") |
| 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 | |
| 25 | ADD_SUBDIRECTORY (libdnf) |
| 26 | ENABLE_TESTING() |
| 27 | -- |
| 28 | 2.11.0 |
| 29 | |