Fix build fail issue for 64bit

Change-Id: I14e1baafdd7793e824173852428262035eef365c
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

diff --git a/bt-share/CMakeLists.txt b/bt-share/CMakeLists.txt
index 1e42df5..fd4d951 100644 (file)
--- a/bt-share/CMakeLists.txt
+++ b/bt-share/CMakeLists.txt
@@ -36,7 +36,6 @@ ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(BINDIR "/usr/bin")
 SET(EXEC_PREFIX "\${prefix}")
 SET(INCLUDEDIR "/usr/include")
 SET(VERSION 1.0)
@@ -57,4 +56,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${CALENDAR_SERVICE2_LDFLAG
 
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/org.bluetooth.share.service DESTINATION /usr/share/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/org.bluetooth.share.service DESTINATION share/dbus-1/system-services)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index edaed7b..3ab3806 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -18,7 +18,7 @@ ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "/usr/include")
 SET(VERSION 1.0)
 
@@ -28,8 +28,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${apipkgs_LDFLAGS})
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/bluetooth-share-api)

diff --git a/packaging/bluetooth-share.spec b/packaging/bluetooth-share.spec
index 9c5d38f..dd62b75 100644 (file)
--- a/packaging/bluetooth-share.spec
+++ b/packaging/bluetooth-share.spec
@@ -103,20 +103,11 @@ install -D -m 0755 %{SOURCE1004} %{buildroot}%{TZ_SYS_SHARE}/%{name}/ressources/
 %files -n libbluetooth-share
 %manifest libbluetooth-share.manifest
 %defattr(-, root, root)
-%ifarch aarch64
-/usr/lib/libbluetooth-share-api.so.0.*
-%else
 %{_libdir}/libbluetooth-share-api.so.0.*
-%endif
 
 %files -n libbluetooth-share-devel
 %manifest libbluetooth-share-devel.manifest
 %defattr(-, root, root)
 %{_includedir}/bluetooth-share-api/bluetooth-share-api.h
-%ifarch aarch64
-/usr/lib/libbluetooth-share-api.so
-/usr/lib/pkgconfig/bluetooth-share-api.pc
-%else
 %{_libdir}/libbluetooth-share-api.so
 %{_libdir}/pkgconfig/bluetooth-share-api.pc
-%endif