Fix for 64 bit compatibility.

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

Change-Id: Id07cd9900d16f9236905b9c67b561c5ce7049057

diff --git a/ace/CMakeLists.txt b/ace/CMakeLists.txt
index d432a69..99c5281 100644 (file)
--- a/ace/CMakeLists.txt
+++ b/ace/CMakeLists.txt
@@ -130,7 +130,7 @@ TARGET_LINK_LIBRARIES(${TARGET_ACE_LIB}
 )
 
 INSTALL(TARGETS ${TARGET_ACE_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     include/ace/WRT_INTERFACE.h

diff --git a/ace/dao/CMakeLists.txt b/ace/dao/CMakeLists.txt
index e40cf11..9b8a1e0 100644 (file)
--- a/ace/dao/CMakeLists.txt
+++ b/ace/dao/CMakeLists.txt
@@ -77,8 +77,8 @@ target_link_libraries(${TARGET_ACE_DAO_RW_LIB}
 )
 
 INSTALL(TARGETS ${TARGET_ACE_DAO_RO_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(TARGETS ${TARGET_ACE_DAO_RW_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 

diff --git a/ace_client/src/CMakeLists.txt b/ace_client/src/CMakeLists.txt
index 72a7f56..4a46d91 100644 (file)
--- a/ace_client/src/CMakeLists.txt
+++ b/ace_client/src/CMakeLists.txt
@@ -61,7 +61,7 @@ TARGET_LINK_LIBRARIES(${TARGET_ACE_CLIENT_LIB}
     )
 
 INSTALL(TARGETS ${TARGET_ACE_CLIENT_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
 #    ${ACE_CLIENT_INCLUDE_DIR}/ace-client/ace_client.h

diff --git a/ace_install/src/CMakeLists.txt b/ace_install/src/CMakeLists.txt
index d0757e1..c87b4fe 100644 (file)
--- a/ace_install/src/CMakeLists.txt
+++ b/ace_install/src/CMakeLists.txt
@@ -54,7 +54,7 @@ TARGET_LINK_LIBRARIES(${TARGET_ACE_INSTALL_LIB}
     )
 
 INSTALL(TARGETS ${TARGET_ACE_INSTALL_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     ${ACE_INSTALL_INCLUDE_DIR}/ace_api_install.h

diff --git a/ace_popup_validation/src/CMakeLists.txt b/ace_popup_validation/src/CMakeLists.txt
index 69fe495..3029211 100644 (file)
--- a/ace_popup_validation/src/CMakeLists.txt
+++ b/ace_popup_validation/src/CMakeLists.txt
@@ -54,7 +54,7 @@ TARGET_LINK_LIBRARIES(${TARGET_ACE_POPUP_VALIDATION_LIB}
     )
 
 INSTALL(TARGETS ${TARGET_ACE_POPUP_VALIDATION_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     ${ACE_POPUP_VALIDATION_INCLUDE_DIR}/ace_api_popup_validation.h

diff --git a/ace_settings/src/CMakeLists.txt b/ace_settings/src/CMakeLists.txt
index 8cd835e..e661f52 100644 (file)
--- a/ace_settings/src/CMakeLists.txt
+++ b/ace_settings/src/CMakeLists.txt
@@ -48,7 +48,7 @@ TARGET_LINK_LIBRARIES(${TARGET_ACE_SETTINGS_LIB}
     )
 
 INSTALL(TARGETS ${TARGET_ACE_SETTINGS_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     ${ACE_SETTINGS_INCLUDE_DIR}/ace_api_settings.h

diff --git a/build/ace/CMakeLists.txt b/build/ace/CMakeLists.txt
index b42ab2e..a6b2c58 100644 (file)
--- a/build/ace/CMakeLists.txt
+++ b/build/ace/CMakeLists.txt
@@ -26,6 +26,6 @@ INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/ace/security-dao-rw.pc
     ${CMAKE_BINARY_DIR}/build/ace/security.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
   

diff --git a/build/ace/security-dao-ro.pc.in b/build/ace/security-dao-ro.pc.in
index 820a4b3..98c237a 100644 (file)
--- a/build/ace/security-dao-ro.pc.in
+++ b/build/ace/security-dao-ro.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: ace-dao-ro

diff --git a/build/ace/security-dao-rw.pc.in b/build/ace/security-dao-rw.pc.in
index 4268970..64ff12e 100644 (file)
--- a/build/ace/security-dao-rw.pc.in
+++ b/build/ace/security-dao-rw.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: aco-dao-rw

diff --git a/build/ace/security.pc.in b/build/ace/security.pc.in
index 9f5bd4a..366066a 100644 (file)
--- a/build/ace/security.pc.in
+++ b/build/ace/security.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: ace

diff --git a/build/ace_client/CMakeLists.txt b/build/ace_client/CMakeLists.txt
index b7bdaa0..8f74532 100644 (file)
--- a/build/ace_client/CMakeLists.txt
+++ b/build/ace_client/CMakeLists.txt
@@ -21,6 +21,6 @@ CONFIGURE_FILE(security-client.pc.in security-client.pc @ONLY)
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/ace_client/security-client.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
   

diff --git a/build/ace_client/security-client.pc.in b/build/ace_client/security-client.pc.in
index ea166b3..804dc6d 100644 (file)
--- a/build/ace_client/security-client.pc.in
+++ b/build/ace_client/security-client.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: ace-client

diff --git a/build/ace_install/CMakeLists.txt b/build/ace_install/CMakeLists.txt
index 8c0a70b..c9266b3 100644 (file)
--- a/build/ace_install/CMakeLists.txt
+++ b/build/ace_install/CMakeLists.txt
@@ -21,6 +21,6 @@ CONFIGURE_FILE(security-install.pc.in security-install.pc @ONLY)
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/ace_install/security-install.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
   

diff --git a/build/ace_install/security-install.pc.in b/build/ace_install/security-install.pc.in
index 9ddcefa..5c41da5 100644 (file)
--- a/build/ace_install/security-install.pc.in
+++ b/build/ace_install/security-install.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: ace-install

diff --git a/build/ace_popup_validation/CMakeLists.txt b/build/ace_popup_validation/CMakeLists.txt
index b79c6f5..720ea06 100644 (file)
--- a/build/ace_popup_validation/CMakeLists.txt
+++ b/build/ace_popup_validation/CMakeLists.txt
@@ -21,6 +21,6 @@ CONFIGURE_FILE(security-popup-validation.pc.in security-popup-validation.pc @ONL
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/ace_popup_validation/security-popup-validation.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
   

diff --git a/build/ace_popup_validation/security-popup-validation.pc.in b/build/ace_popup_validation/security-popup-validation.pc.in
index 385b47b..fc1e7ab 100644 (file)
--- a/build/ace_popup_validation/security-popup-validation.pc.in
+++ b/build/ace_popup_validation/security-popup-validation.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: ace-popup-validation

diff --git a/build/ace_settings/CMakeLists.txt b/build/ace_settings/CMakeLists.txt
index b768f2f..1830467 100644 (file)
--- a/build/ace_settings/CMakeLists.txt
+++ b/build/ace_settings/CMakeLists.txt
@@ -21,6 +21,6 @@ CONFIGURE_FILE(security-settings.pc.in security-settings.pc @ONLY)
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/ace_settings/security-settings.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
   

diff --git a/build/ace_settings/security-settings.pc.in b/build/ace_settings/security-settings.pc.in
index 1abc082..aab9f6f 100644 (file)
--- a/build/ace_settings/security-settings.pc.in
+++ b/build/ace_settings/security-settings.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: ace-settings

diff --git a/build/communication_client/CMakeLists.txt b/build/communication_client/CMakeLists.txt
index 4f11913..8942a30 100644 (file)
--- a/build/communication_client/CMakeLists.txt
+++ b/build/communication_client/CMakeLists.txt
@@ -21,6 +21,6 @@ CONFIGURE_FILE(security-communication-client.pc.in security-communication-client
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/communication_client/security-communication-client.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
 

diff --git a/build/communication_client/security-communication-client.pc.in b/build/communication_client/security-communication-client.pc.in
index 1b01b5f..b86a4a4 100644 (file)
--- a/build/communication_client/security-communication-client.pc.in
+++ b/build/communication_client/security-communication-client.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: communication-client

diff --git a/build/wrt-security/CMakeLists.txt b/build/wrt-security/CMakeLists.txt
index 9995265..3ac02e1 100644 (file)
--- a/build/wrt-security/CMakeLists.txt
+++ b/build/wrt-security/CMakeLists.txt
@@ -16,4 +16,4 @@
 # @author      Tomasz Swierczek (t.swierczek@samsung.com)
 #
 CONFIGURE_FILE(security-core.pc.in security-core.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/build/wrt-security/security-core.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/build/wrt-security/security-core.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/build/wrt-security/security-core.pc.in b/build/wrt-security/security-core.pc.in
index 7f63cc5..e99ba9e 100644 (file)
--- a/build/wrt-security/security-core.pc.in
+++ b/build/wrt-security/security-core.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include/wrt-security
 
 Name: wrt-security

diff --git a/build/wrt_ocsp/CMakeLists.txt b/build/wrt_ocsp/CMakeLists.txt
index 7b1bf5f..ab11f72 100644 (file)
--- a/build/wrt_ocsp/CMakeLists.txt
+++ b/build/wrt_ocsp/CMakeLists.txt
@@ -21,6 +21,6 @@ CONFIGURE_FILE(security-wrt-ocsp.pc.in security-wrt-ocsp.pc @ONLY)
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/wrt_ocsp/security-wrt-ocsp.pc
     DESTINATION
-    lib/pkgconfig
+    ${LIB_INSTALL_DIR}/pkgconfig
     )
 

diff --git a/build/wrt_ocsp/security-wrt-ocsp.pc.in b/build/wrt_ocsp/security-wrt-ocsp.pc.in
index 2fb4258..e965e8e 100644 (file)
--- a/build/wrt_ocsp/security-wrt-ocsp.pc.in
+++ b/build/wrt_ocsp/security-wrt-ocsp.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: wrt-ocsp

diff --git a/packaging/wrt-security.spec b/packaging/wrt-security.spec
index db9c786..36bab5e 100644 (file)
--- a/packaging/wrt-security.spec
+++ b/packaging/wrt-security.spec
@@ -47,11 +47,10 @@ Certificates for wrt.
 %setup -q
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib"
+export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-        -DDPL_LOG="ON"                    \
-        -DVERSION=%{version}              \
+%cmake . -DDPL_LOG="ON" \
+        -DVERSION=%{version} \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}
 make %{?jobs:-j%jobs}
 

diff --git a/wrt_ocsp/src/CMakeLists.txt b/wrt_ocsp/src/CMakeLists.txt
index 01c746a..35bc91b 100644 (file)
--- a/wrt_ocsp/src/CMakeLists.txt
+++ b/wrt_ocsp/src/CMakeLists.txt
@@ -52,7 +52,7 @@ TARGET_LINK_LIBRARIES(${TARGET_WRT_OCSP_LIB}
     )
 
 INSTALL(TARGETS ${TARGET_WRT_OCSP_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     ${WRT_OCSP_INCLUDE_DIR}/wrt_ocsp_api.h