Remove Errors from full 64 bit build

Change-Id: Ibb12047ad917b79b143c1c6dbb206a937e04f38a
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0f48ac751b1387a1d52eb683aedcd49c3f7c89e..9c4e2be1c67901366f0c360b5f22eb7e5a379264 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,6 @@ PROJECT(nfc-manager C CXX)
 MESSAGE("build nfc-common-lib and nfc-manager")
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(LIBDIR "${PREFIX}/lib")
 SET(MODULEDIR "${LIBDIR}/nfc")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 ADD_DEFINITIONS("-D_GNU_SOURCE")

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index bc25378339be1ab18f855fe2ef3a5db2d8fc58a1..1222a96a813c7f1c84bbed5e5d223d966d1482c0 100644 (file)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -98,6 +98,8 @@ export LDFLAGS+=" -lgcov"
 
 export LDFLAGS+=" -Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 LDFLAGS="$LDFLAGS" cmake . \
+               -DLIBDIR=%{_libdir} \
+               -DINCLUDE_INSTALL_DIR=%{_includedir} \
                -DTIZEN_ENGINEER_MODE=1 \
                -DCMAKE_INSTALL_PREFIX=%{_prefix} \
                -DTIZEN_TELEPHONY_ENABLED=1 \

diff --git a/src/commonlib/nfc-common-lib.pc.in b/src/commonlib/nfc-common-lib.pc.in
index 30c205497affcd9fbc799d6c37e8e1e43bd6bb5a..e2fe8c709a10dd557f79a9156d2400d810b5ec0a 100644 (file)
--- a/src/commonlib/nfc-common-lib.pc.in
+++ b/src/commonlib/nfc-common-lib.pc.in
@@ -1,11 +1,11 @@
 prefix=@PREFIX@
 exec_prefix=${prefix}/bin
-libdir=@LIB_INSTALL_DIR@
+libdir=@LIBDIR@
 includedir=@INCLUDE_INSTALL_DIR@/nfc-common-lib
 
 Name: nfc-common-lib
 Description: NFC Common Library
 Version: 1.0
-Requires: 
+Requires:
 Libs: -L@LIB_INSTALL_DIR@ -lnfc-common-lib
 Cflags: -I@INCLUDE_INSTALL_DIR@/nfc-common-lib