Fix for 64 bit compatibility.

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

Change-Id: Ib1e658e004e7d4bd3095aaa7f75c240dc59a7e7f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdcf3ea..617689a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES (
        /usr/include/appfw
        /usr/include/dlog
        /usr/include/glib-2.0
-       /usr/lib/glib-2.0/include
+       ${LIB_INSTALL_DIR}/glib-2.0/include
        /usr/include/chromium
        include
        )
@@ -53,7 +53,7 @@ ADD_DEFINITIONS("-DSLP_DEBUG")
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 ## SET LINKER FLAGS
-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}")
 
 TARGET_LINK_LIBRARIES(${this_target} "-ldlog" )
 TARGET_LINK_LIBRARIES(${this_target} "-lbundle" )
@@ -71,13 +71,13 @@ SET_TARGET_PROPERTIES(${this_target}
 
 # pkgconfig file
 CONFIGURE_FILE(${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${this_target}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${this_target}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-INSTALL(TARGETS ${this_target} DESTINATION lib)
+INSTALL(TARGETS ${this_target} DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/appfw FILES_MATCHING PATTERN "*.h")
 
-INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib
+INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION ${LIB_INSTALL_DIR}
                FILES_MATCHING PATTERN "*.so*" 
                PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ                      
                     GROUP_EXECUTE GROUP_READ

diff --git a/message-port.pc.in b/message-port.pc.in
index bd96a4c..ec7cdb8 100755 (executable)
--- a/message-port.pc.in
+++ b/message-port.pc.in
@@ -3,7 +3,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/appfw
 
 Name: @PC_NAME@

diff --git a/packaging/message-port.spec b/packaging/message-port.spec
index 1c887d7..49c8756 100755 (executable)
--- a/packaging/message-port.spec
+++ b/packaging/message-port.spec
@@ -41,7 +41,7 @@ Message Port library (DEV)
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 # Call make instruction with smp support
 make %{?jobs:-j%jobs}