From: Junfeng Dong Date: Thu, 31 Jan 2013 11:42:32 +0000 (+0800) Subject: Fixed build on x86_64. X-Git-Tag: 2.1b_release~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Ftelephony%2Ftel-plugin-vmodem.git;a=commitdiff_plain;h=b3b3ee5fa1b85c543f29eb0f9540d320bfd7b666 Fixed build on x86_64. Change-Id: I98a485bef562c4e16d5c65f3ced7fac85751abc7 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d3d8ba5..8c5e956 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") -SET(PKGCONFIGDIR "${PREFIX}/lib/pkgconfig" CACHE PATH PKGCONFIGDIR) +SET(PKGCONFIGDIR "${PREFIX}/${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH PKGCONFIGDIR) SET(CMAKE_INSTALL_PREFIX "${PREFIX}") # Set required packages @@ -43,5 +43,5 @@ SET_TARGET_PROPERTIES(vmodem-plugin PROPERTIES PREFIX "" OUTPUT_NAME vmodem-plug # install INSTALL(TARGETS vmodem-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-vmodem) diff --git a/packaging/tel-plugin-vmodem.spec b/packaging/tel-plugin-vmodem.spec index 89e8d91..00efa44 100644 --- a/packaging/tel-plugin-vmodem.spec +++ b/packaging/tel-plugin-vmodem.spec @@ -1,7 +1,6 @@ -#sbs-git:slp/pkgs/t/tel-plugin-vmodem Name: tel-plugin-vmodem Summary: Telephony AT Virtual Modem library -Version: 0.1.8 +Version: 0.1.8 Release: 1 Group: System/Libraries License: Apache @@ -20,7 +19,7 @@ Telephony AT Modem library %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %post @@ -29,13 +28,11 @@ make %{?jobs:-j%jobs} %postun -p /sbin/ldconfig %install -rm -rf %{buildroot} %make_install mkdir -p %{buildroot}/usr/share/license %files %manifest tel-plugin-vmodem.manifest %defattr(-,root,root,-) -#%doc COPYING %{_libdir}/telephony/plugins/vmodem-plugin* /usr/share/license/tel-plugin-vmodem