From a466f8aa233b78864aca302405799b5c45f14054 Mon Sep 17 00:00:00 2001 From: Junfeng Dong Date: Thu, 31 Jan 2013 19:29:00 +0800 Subject: [PATCH] Fixed build on x86_64. Change-Id: Ie9aceb0dbd2c69f3e8c4983cda0a39a49c16c374 --- CMakeLists.txt | 4 ++-- packaging/tel-plugin-imcmodem.spec | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ec7799..2354717 100755 --- 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 @@ -44,5 +44,5 @@ SET_TARGET_PROPERTIES(imcmodem-plugin PROPERTIES PREFIX "" OUTPUT_NAME imcmodem- # install INSTALL(TARGETS imcmodem-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-imcmodem) diff --git a/packaging/tel-plugin-imcmodem.spec b/packaging/tel-plugin-imcmodem.spec index 6acd408..bd62343 100644 --- a/packaging/tel-plugin-imcmodem.spec +++ b/packaging/tel-plugin-imcmodem.spec @@ -1,4 +1,3 @@ -#sbs-git:slp/pkgs/t/tel-plugin-imcmodem Name: tel-plugin-imcmodem Summary: telephony plugin library for AT communication with IMC modem Version: 0.1.4 @@ -20,7 +19,7 @@ imcmodem plugin for telephony %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-imcmodem.manifest %defattr(-,root,root,-) -#%doc COPYING %{_libdir}/telephony/plugins/* /usr/share/license/tel-plugin-imcmodem -- 2.7.4