From 02a9498f8f51cc66a73c768578b03680bf233e12ded4e03932185ae024661626 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 24 Apr 2023 09:18:48 +0000 Subject: [PATCH] Accepting request 1082125 from home:gmbr3:Active - macros: Re-add old setup on top of new - some applications still use the old version OBS-URL: https://build.opensuse.org/request/show/1082125 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=528 --- cmake.changes | 6 ++++++ cmake.macros | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/cmake.changes b/cmake.changes index dd3dc6b..0fae358 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 21 19:24:16 UTC 2023 - Callum Farmer + +- macros: Re-add old setup on top of new - some applications still + use the old version + ------------------------------------------------------------------- Thu Apr 20 19:52:52 UTC 2023 - Callum Farmer diff --git a/cmake.macros b/cmake.macros index 9cd25be..a1e312b 100644 --- a/cmake.macros +++ b/cmake.macros @@ -32,6 +32,10 @@ -DCMAKE_INSTALL_LIBDIR:PATH=%{__cmake_make_prefix_relative %{_libdir}} \\\ -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{__cmake_make_prefix_relative %{_includedir}} \\\ -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{__cmake_make_prefix_relative %{_datadir}} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\