From aa239e570171d7c8b399d6c95a44d69d8c94622b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 12 May 2024 12:29:34 +0300 Subject: [PATCH] kinfocenter: use KStandardDirs::installPath() to get the library path slightly more flexible Signed-off-by: Ivailo Monev --- config-workspace.h.cmake | 3 --- kinfocenter/Modules/kernel/kernel.cpp | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake index 19e0dca3..65fc7701 100644 --- a/config-workspace.h.cmake +++ b/config-workspace.h.cmake @@ -9,8 +9,5 @@ /* KDE's default home directory */ #cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}" -/* KDE's static libraries directory */ -#define KDE_LIBDIR "${KDE4_LIB_INSTALL_DIR}" - /* KDE's system configuration directory */ #define KDE_SYSCONFDIR "${KDE4_SYSCONF_INSTALL_DIR}" diff --git a/kinfocenter/Modules/kernel/kernel.cpp b/kinfocenter/Modules/kernel/kernel.cpp index 1e0996d5..e2179613 100644 --- a/kinfocenter/Modules/kernel/kernel.cpp +++ b/kinfocenter/Modules/kernel/kernel.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,7 @@ static const QStringList s_firmwarepaths = QStringList() << "/lib/firmware" << "/usr/lib/firmware" - << KDE_LIBDIR "/firmware"; + << KStandardDirs::installPath("lib") + "firmware"; K_PLUGIN_FACTORY(KCMKernelFactory, registerPlugin();) K_EXPORT_PLUGIN(KCMKernelFactory("kcmkernel"))