From 528d42ee98a165bebedfe3ecb2c52876495679a8 Mon Sep 17 00:00:00 2001 From: Junfeng Dong Date: Thu, 31 Jan 2013 19:26:08 +0800 Subject: [PATCH] Fixed build on x86_64. Change-Id: Idc3c8cc19fe82d566287c34d9a31f9c823f0e554 --- CMakeLists.txt | 2 +- packaging/tel-plugin-database.spec | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac50494..161d60b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,5 +42,5 @@ SET_TARGET_PROPERTIES(db-plugin PROPERTIES PREFIX "" OUTPUT_NAME db-plugin) # install INSTALL(TARGETS db-plugin - LIBRARY DESTINATION lib/telephony/plugins) + LIBRARY DESTINATION ${LIB_INSTALL_DIR}/telephony/plugins) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-database) diff --git a/packaging/tel-plugin-database.spec b/packaging/tel-plugin-database.spec index c55ce18..80539a9 100644 --- a/packaging/tel-plugin-database.spec +++ b/packaging/tel-plugin-database.spec @@ -1,7 +1,6 @@ -#sbs-git:slp/pkgs/t/tel-plugin-database Name: tel-plugin-database Summary: Telephony DataBase storage plugin -Version: 0.1.7 +Version: 0.1.7 Release: 1 Group: System/Libraries License: Apache @@ -21,7 +20,7 @@ Telephony DataBase storage plugin %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %post @@ -30,12 +29,9 @@ make %{?jobs:-j%jobs} %postun -p /sbin/ldconfig %install -rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/usr/share/license %files %defattr(-,root,root,-) -#%doc COPYING %{_libdir}/telephony/plugins/db-plugin* /usr/share/license/tel-plugin-database -- 2.7.4