Fixed build on x86_64.

Change-Id: Ieb8f3d0f771428ac9117fc9611ed390a485776b6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbdd52c27e61027f353d9fed32f3a9e73708b539..1d8f5400b5d302fdcd0d53ccb575bb48dc29e463 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,4 +30,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)

diff --git a/packaging/device-manager-plugin-maru.spec b/packaging/device-manager-plugin-maru.spec
index 42d20e2363565650857e1ca62215450b74d4566d..89453dca91bf8371a77e84aa2e2024ac4d06dfde 100644 (file)
--- a/packaging/device-manager-plugin-maru.spec
+++ b/packaging/device-manager-plugin-maru.spec
@@ -18,13 +18,12 @@ device-manager-plugin-maru.
 %setup -q
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
+%cmake .
 
 make 
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 %post