libemuld: fix 64bit build error

Change-Id: Ib6396b9d9664eb563f9379a55d85a84d4ffbf88a
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

diff --git a/packaging/emuld.spec b/packaging/emuld.spec
index d6763cb774f3963068de558492031f96c6936747..0fd1533937d39ad22c6c1017dd78a23884d3d081 100644 (file)
--- a/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@ -75,6 +75,7 @@ export CFLAGS+=" -DUNKNOWN_PROFILE"
 
 cmake . \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+    -DLIB_INSTALL_DIR=%{_libdir} \
     -DMSGPROC_HDS=%{msgproc_hds} \
     -DMSGPROC_CMD=%{msgproc_cmd} \
     -DMSGPROC_PACKAGE=%{msgproc_package} \

diff --git a/src/libemuld/CMakeLists.txt b/src/libemuld/CMakeLists.txt
index bd68c60a791246fce99105c06758d7ed08b2d135..8875b434008f95332d8413d3cce60e8e3043d26c 100644 (file)
--- a/src/libemuld/CMakeLists.txt
+++ b/src/libemuld/CMakeLists.txt
@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME emuld)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/libemuld.h
               ${CMAKE_SOURCE_DIR}/include/emuld_log.h
@@ -40,4 +40,4 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/libemuld.h
               ${CMAKE_SOURCE_DIR}/include/msgproc.h
         DESTINATION include/${PROJECT_NAME})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)

diff --git a/src/libemuld/libemuld.pc.in b/src/libemuld/libemuld.pc.in
index 25e9bde71645b49aed4985654db6a2e4398b8079..5b379b3fe3d202d85115b4e81c0eecd23ba3a569 100644 (file)
--- a/src/libemuld/libemuld.pc.in
+++ b/src/libemuld/libemuld.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: libemuld