diff --git a/cmake.changes b/cmake.changes index 41c9e90..5deffc8 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 14 10:29:33 UTC 2020 - Dirk Mueller + +- reapply this change (bsc#1174581): + * Fix setting CMAKE_INSTALL_LIBDIR in cmake macro + * This is a relative path, see `cmake --help-module GNUInstallDirs` + see also + https://gitlab.kitware.com/cmake/cmake/-/issues/20250 + https://github.com/arvidn/libtorrent/issues/5125#issuecomment-691559244 + ------------------------------------------------------------------- Mon Aug 24 19:02:49 UTC 2020 - Dirk Mueller diff --git a/cmake.macros b/cmake.macros index 4501e31..8151b9d 100644 --- a/cmake.macros +++ b/cmake.macros @@ -23,7 +23,7 @@ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\