Remove Hardcoded Path for lib dir : use %libdir for 64bit

Change-Id: I6121281e34014c04f5375b13fc776d6591659e7c

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index f16d192..fe80dd9 100644 (file)
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -120,7 +120,8 @@ cp %{SOURCE3} .
                --disable-debug-mode \
                --disable-eng-mode
 
-%__make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs} \
+       CFLAGS+=-DLIBDIR=\\\"%{_libdir}\\\"
 
 %install
 rm -rf %{buildroot}

diff --git a/src/systemd-user-helper/systemd-user-helper.c b/src/systemd-user-helper/systemd-user-helper.c
index a61a90d..6ffe977 100644 (file)
--- a/src/systemd-user-helper/systemd-user-helper.c
+++ b/src/systemd-user-helper/systemd-user-helper.c
@@ -36,8 +36,8 @@
 #define LEGACY_CONTENTS_DIR "/opt/usr/media"
 #define LEGACY_APPS_DIR "/opt/usr/apps"
 
-#define LAZYMOUNT_LIB "/usr/lib/liblazymount.so.0"
-#define CONTAINER_LIB "/usr/lib/security/pam_krate.so"
+#define LAZYMOUNT_LIB LIBDIR"/liblazymount.so.0"
+#define CONTAINER_LIB LIBDIR"/security/pam_krate.so"
 
 #define LOAD_SYMBOL(handle, sym, name) \
        do { \