From 0225148ab53a222d84fd6a3a894281e71d64384b Mon Sep 17 00:00:00 2001 From: Kunhoon Baik Date: Wed, 17 Jun 2020 12:12:06 +0900 Subject: [PATCH] Support 64bit Image 64bit Image uses libraries from /usr/lib64 (from _libdir macro) This patch is correction for that. Change-Id: I3810334e947002596cb13a45fbce1df78d7897e7 --- Makefile | 1 + packaging/stability-monitor.spec | 3 ++- src/stability-monitor.c | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index eafaffa..6aa08ce 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ CFLAGS = \ -Wall \ -I$(srcdir) \ `pkg-config --cflags $(libs)` \ + -DDEFAULT_CONFIG_FILE="\"$(DEFAULT_CONFIG_FILE)\"" \ -D_GNU_SOURCE \ -fPIE diff --git a/packaging/stability-monitor.spec b/packaging/stability-monitor.spec index e23cd38..5168dd1 100644 --- a/packaging/stability-monitor.spec +++ b/packaging/stability-monitor.spec @@ -31,7 +31,8 @@ Tests for stability monitoring tool cp %{SOURCE1} ./%{name}.manifest %build -make stability-monitor +make stability-monitor DEFAULT_CONFIG_FILE=%{_libdir}/stability-monitor/default.conf + make -C tests all %install diff --git a/src/stability-monitor.c b/src/stability-monitor.c index cfebe34..0bf2bf1 100644 --- a/src/stability-monitor.c +++ b/src/stability-monitor.c @@ -32,7 +32,6 @@ #include "raw_data.h" #include "data_source.h" -#define DEFAULT_CONFIG_FILE "/usr/lib/stability-monitor/default.conf" #define USER_CONFIG_DIR "/etc/stability-monitor.d" @@ -318,4 +317,4 @@ int main(int argc, char *argv[]) cleanup(); return 0; -} \ No newline at end of file +} -- 2.34.1