Fix for 64 bit compatibility.

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

Change-Id: If7ca1ed79cc836aa48ada37bf2e91b868d1e34b1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7a8f50..8cc8949 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ PROJECT(accounts-svc C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include ")
 SET(VERSION_MAJOR 0)
 SET(VERSION "${VERSION_MAJOR}.2.41")
@@ -66,9 +65,9 @@ TARGET_LINK_LIBRARIES("account-xml-verify" ${pkgs_LDFLAGS})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib/accounts-svc)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/accounts-svc)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 INSTALL(TARGETS account-xml-verify DESTINATION bin)
 

diff --git a/accounts-svc.pc.in b/accounts-svc.pc.in
index 3a1d283..8b1a6fa 100755 (executable)
--- a/accounts-svc.pc.in
+++ b/accounts-svc.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: accounts-svc

diff --git a/packaging/libaccounts-svc.spec b/packaging/libaccounts-svc.spec
index cad65cd..f2d73da 100755 (executable)
--- a/packaging/libaccounts-svc.spec
+++ b/packaging/libaccounts-svc.spec
@@ -36,7 +36,7 @@ Development files for %{name}
 
 %build
 export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden"
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+%cmake .
 
 make %{?jobs:-j%jobs}
 
@@ -44,7 +44,7 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-rm -rf %{buildroot}/usr/lib/accounts-svc
+rm -rf %{buildroot}%{_libdir}/accounts-svc
 
 %post
 /sbin/ldconfig