Fixed build on x86_64.
authorJunfeng Dong <junfeng.dong@intel.com>
Thu, 31 Jan 2013 13:13:58 +0000 (21:13 +0800)
committerJunfeng Dong <junfeng.dong@intel.com>
Thu, 31 Jan 2013 13:13:58 +0000 (21:13 +0800)
Change-Id: Ieb8f3d0f771428ac9117fc9611ed390a485776b6

CMakeLists.txt
packaging/device-manager-plugin-maru.spec

index bbdd52c..1d8f540 100644 (file)
@@ -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)
index 42d20e2..89453dc 100644 (file)
@@ -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