Fix for 64-bit build compatibility

Change-Id: Idf686b9dc3dfe71569fd9cd40b1054613798cf82
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3268c9..7d85725 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(telephony-daemon C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
@@ -23,7 +23,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_CFLAGS}")
 ADD_DEFINITIONS("-DFEATURE_TLOG_DEBUG")
 ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"DAEMON\"")
 ADD_DEFINITIONS("-DDAEMON_VERSION=\"${VERSION}\"")
-ADD_DEFINITIONS("-DDEFAULT_PLUGINS_PATH=\"/usr/lib/telephony/plugins/\"")
+ADD_DEFINITIONS("-DDEFAULT_PLUGINS_PATH=\"${LIBDIR}/telephony/plugins/\"")
 
 IF (TIZEN_DEBUG_ENABLE)
        ADD_DEFINITIONS ("-DTIZEN_DEBUG_ENABLE")
@@ -51,4 +51,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl")
 # install
 INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME telephony-daemon)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon.service DESTINATION /usr/lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon.service DESTINATION ${LIBDIR}/systemd/system)

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 00f61ab..4eaf2bf 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -23,7 +23,9 @@ Description: Telephony Daemon
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
+       -DVERSION=%{version} \
        -DTIZEN_DEBUG_ENABLE=1 \
 
 make %{?_smp_mflags}