Revert "Fixed build on x86_64."

This reverts commit 38bfbc2e691d3b943bb15c05dc7fa0a7dab0129b

Change-Id: Ibf4b4bf04a39d2fb9fbe6e94d1c1bc24c01efd6a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2354717..1ec7799 100755 (executable)
--- 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_INSTALL_DIR}/pkgconfig" CACHE PATH PKGCONFIGDIR)
+SET(PKGCONFIGDIR "${PREFIX}/lib/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_INSTALL_DIR}/telephony/plugins)
+               LIBRARY DESTINATION lib/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 bd62343..6acd408 100644 (file)
--- a/packaging/tel-plugin-imcmodem.spec
+++ b/packaging/tel-plugin-imcmodem.spec
@@ -1,3 +1,4 @@
+#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
@@ -19,7 +20,7 @@ imcmodem plugin for telephony
 %setup -q
 
 %build
-%cmake .
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 make %{?jobs:-j%jobs}
 
 %post
@@ -28,11 +29,13 @@ 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