Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: Ib2cb53e5d278d113775300132ab285b29366156f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf87993..3ef2e48 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
@@ -42,7 +42,7 @@ SET_TARGET_PROPERTIES(${fw_name}
     CLEAN_DIRECT_OUTPUT 1
 )
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
     DIRECTORY ${INC_DIR}/ DESTINATION include/messaging
     FILES_MATCHING
@@ -60,7 +60,7 @@ CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 ADD_SUBDIRECTORY(test)
 

diff --git a/capi-messaging-messages.pc.in b/capi-messaging-messages.pc.in
index a771af9..edeeaed 100644 (file)
--- a/capi-messaging-messages.pc.in
+++ b/capi-messaging-messages.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include
 
 Name: @PC_NAME@

diff --git a/packaging/capi-messaging-messages.spec b/packaging/capi-messaging-messages.spec
index d118d97..03be959 100644 (file)
--- a/packaging/capi-messaging-messages.spec
+++ b/packaging/capi-messaging-messages.spec
@@ -34,13 +34,12 @@ Requires:  pkgconfig(capi-base-common)
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 rm -fr cmake_build_tmp; mkdir cmake_build_tmp
 cd cmake_build_tmp
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake .. -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
@@ -61,5 +60,3 @@ cd cmake_build_tmp
 %{_includedir}/messaging/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libcapi-messaging-messages.so
-
-