diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-01-31 21:13:58 +0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-01-31 21:13:58 +0800 |
| commit | d9a22dc4dc1942e186c10b4416125179ca44e85d (patch) | |
| tree | 5b4cc0a08231a4faf47993176bda1334621b18e6 | |
| parent | c3c0bc891d72136769543ae1fe853506b44bc83c (diff) | |
| download | device-manager-plugin-emul-d9a22dc4dc1942e186c10b4416125179ca44e85d.tar.gz device-manager-plugin-emul-d9a22dc4dc1942e186c10b4416125179ca44e85d.tar.bz2 device-manager-plugin-emul-d9a22dc4dc1942e186c10b4416125179ca44e85d.zip | |
Fixed build on x86_64.
Change-Id: Ieb8f3d0f771428ac9117fc9611ed390a485776b6
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/device-manager-plugin-maru.spec | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bbdd52c..1d8f540 100644 --- 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 42d20e2..89453dc 100644 --- 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 |