Fix x86-64 compliance

-> Fix lib dir for installation
-> Fix pc file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd7e778dd05367dc2e50978c7efc2981bf5b73a3..ca33fdf88032864b515e3f6bf26cc6ceecfe77d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
 
 # Comment this to disable control of global settings with environment variable
 ADD_DEFINITIONS("-DGLOBAL_SETTINGS_CONTROL")
-
+ADD_DEFINITIONS("-DLIBDIR_PREFIX=\"${LIB_INSTALL_DIR}\"")
 # Build type
 IF(NOT CMAKE_BUILD_TYPE)
     SET(CMAKE_BUILD_TYPE "Release")
@@ -193,7 +193,7 @@ SET(TARGET_DPL_ENCRYPTION "lib${PROJECT_NAME}-encryption")
 
 macro(configure_and_install_pkg PKG_FILE)
     CONFIGURE_FILE(${PKG_FILE}.in ${PKG_FILE} @ONLY)
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_FILE} DESTINATION lib/pkgconfig)
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 endmacro(configure_and_install_pkg)
 
 ADD_SUBDIRECTORY(modules)

diff --git a/build/auto_save_dao/wrt-commons-auto-save-dao-ro.pc.in b/build/auto_save_dao/wrt-commons-auto-save-dao-ro.pc.in
index 2784bef30d5770d198dbd702d6744ad7e74457e8..6600968640004d803b7ca8a125a63abc00bb6249 100644 (file)
--- a/build/auto_save_dao/wrt-commons-auto-save-dao-ro.pc.in
+++ b/build/auto_save_dao/wrt-commons-auto-save-dao-ro.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: wrt-commons-auto-save-dao-ro
 Description: wrt-commons-auto-save-dao-ro

diff --git a/build/auto_save_dao/wrt-commons-auto-save-dao-rw.pc.in b/build/auto_save_dao/wrt-commons-auto-save-dao-rw.pc.in
index bb4bd7023fac36a86c9621c2da374045e681af1b..77589bd3297915a78f7762ec36b41aff51b0ef50 100644 (file)
--- a/build/auto_save_dao/wrt-commons-auto-save-dao-rw.pc.in
+++ b/build/auto_save_dao/wrt-commons-auto-save-dao-rw.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: wrt-commons-auto-save-dao-rw
 Description: wrt-commons-auto-save-dao-rw

diff --git a/build/auto_save_dao/wrt-commons-auto-save-dao.pc.in b/build/auto_save_dao/wrt-commons-auto-save-dao.pc.in
index 11e3ca9f5f89d5804599bf6bc6dc770498d95463..09e0ab4c94abe94e13746b86a876aa29aaf6aa46 100644 (file)
--- a/build/auto_save_dao/wrt-commons-auto-save-dao.pc.in
+++ b/build/auto_save_dao/wrt-commons-auto-save-dao.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: wrt-commons-auto-save-dao
 Description: wrt-commons-auto-save-dao

diff --git a/build/core/CMakeLists.txt b/build/core/CMakeLists.txt
index d0e569991826beb5ef2f0345557a71955a787f65..cbe778fcf07a856216de80fb7b6c03b3c7a76095 100644 (file)
--- a/build/core/CMakeLists.txt
+++ b/build/core/CMakeLists.txt
@@ -62,7 +62,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_CORE_EFL_DETAIL_HEADERS}

diff --git a/build/core/dpl-efl.pc.in b/build/core/dpl-efl.pc.in
index 6d2a8822cbde3dfdab5f08c442b8b702736ed2a6..d42414a8c3667fdd6290f248eeed3df3abfd8de0 100644 (file)
--- a/build/core/dpl-efl.pc.in
+++ b/build/core/dpl-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-efl

diff --git a/build/custom_handler_dao/wrt-commons-custom-handler-dao-ro.pc.in b/build/custom_handler_dao/wrt-commons-custom-handler-dao-ro.pc.in
index 7cda1872160c5f6c1a75517b917ece5e0f54800b..2fdf64753b270d18ea399cb3a5c7f29441006e5c 100644 (file)
--- a/build/custom_handler_dao/wrt-commons-custom-handler-dao-ro.pc.in
+++ b/build/custom_handler_dao/wrt-commons-custom-handler-dao-ro.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: wrt-commons-custom-handler-dao-ro
 Description: wrt-commons-custom-handler-dao-ro
@@ -9,4 +9,4 @@ Description: wrt-commons-custom-handler-dao-ro
 Version: @VERSION@
 Requires: dpl-efl
 Libs: -lwrt-commons-custom-handler-dao-ro -L${libdir}
-Cflags: -I${includedir}/dpl-efl
+Cflags: -I${includedir}/dpl-efl -DLIBDIR_PREFIX=\"${libdir}\"

diff --git a/build/custom_handler_dao/wrt-commons-custom-handler-dao-rw.pc.in b/build/custom_handler_dao/wrt-commons-custom-handler-dao-rw.pc.in
index 4cd2737d4188bdd4e22f86bd6db97387b7951951..91975e278b9cf361cbf1dfbeab22413bf15afd37 100644 (file)
--- a/build/custom_handler_dao/wrt-commons-custom-handler-dao-rw.pc.in
+++ b/build/custom_handler_dao/wrt-commons-custom-handler-dao-rw.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: wrt-commons-custom-handler-dao-rw
 Description: wrt-commons-custom-handler-dao-rw

diff --git a/build/db/CMakeLists.txt b/build/db/CMakeLists.txt
index 29dd4955de3410858f4b742faa0536cf3a524a14..d4e60fc31bfea5010d0ffe827e30afff7221859c 100644 (file)
--- a/build/db/CMakeLists.txt
+++ b/build/db/CMakeLists.txt
@@ -60,7 +60,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_DB_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_DB_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_DB_HEADERS}

diff --git a/build/db/dpl-db-efl.pc.in b/build/db/dpl-db-efl.pc.in
index 866bb0fa0cebdca66185f91d6bf847ff55d4c1ce..d68ec91c87c319ff0ec1cae7b48fe6304b1e6795 100644 (file)
--- a/build/db/dpl-db-efl.pc.in
+++ b/build/db/dpl-db-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-db-efl

diff --git a/build/dbus/CMakeLists.txt b/build/dbus/CMakeLists.txt
index 59b2db11b7b9a27c85deec44888a849d7233f397..b837a8c19323f2d39c8e410810e8c1fc2f910f80 100644 (file)
--- a/build/dbus/CMakeLists.txt
+++ b/build/dbus/CMakeLists.txt
@@ -62,7 +62,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_DBUS_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_DBUS_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_DBUS_HEADERS}

diff --git a/build/dbus/dpl-dbus-efl.pc.in b/build/dbus/dpl-dbus-efl.pc.in
index 73f2c035c9947df453d3b46ad81da257a447c1b4..52742dc1b8618d2cda081367a39ecb0a00e11268 100644 (file)
--- a/build/dbus/dpl-dbus-efl.pc.in
+++ b/build/dbus/dpl-dbus-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-dbus-efl

diff --git a/build/encryption/CMakeLists.txt b/build/encryption/CMakeLists.txt
index 6e643b28167741385ab29be3c817aca51c8287fd..1b6a4a56dadadbe6085814dba60a18cb16d1cc19 100644 (file)
--- a/build/encryption/CMakeLists.txt
+++ b/build/encryption/CMakeLists.txt
@@ -65,7 +65,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_ENCRYPTION} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_ENCRYPTION}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 

diff --git a/build/encryption/dpl-encryption.pc.in b/build/encryption/dpl-encryption.pc.in
index dfddda3b277b0e9fbfda72ca5e6e863ee9700f56..b1c338c8951eeed2c6fbf64e82a20a922ebeee75 100644 (file)
--- a/build/encryption/dpl-encryption.pc.in
+++ b/build/encryption/dpl-encryption.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-encryption

diff --git a/build/event/CMakeLists.txt b/build/event/CMakeLists.txt
index b023e0ad4be64e30c480d36d705082d28a4ec9a3..0c00e91a2231551541813bc7b708a415d759b907 100644 (file)
--- a/build/event/CMakeLists.txt
+++ b/build/event/CMakeLists.txt
@@ -62,7 +62,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_EVENT_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_EVENT_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_EVENT_HEADERS}

diff --git a/build/event/dpl-event-efl.pc.in b/build/event/dpl-event-efl.pc.in
index d4befbe932d59da00ea7793e6affb017decd94e5..fe6eae5af37f18b67ce76f077e0d8e40c410947d 100644 (file)
--- a/build/event/dpl-event-efl.pc.in
+++ b/build/event/dpl-event-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-event-efl

diff --git a/build/log/CMakeLists.txt b/build/log/CMakeLists.txt
index 47379d576449b78891377753cfb23481a95dc9bb..1e4b9eec75b4f4bca33063362f7c1a70664e77be 100644 (file)
--- a/build/log/CMakeLists.txt
+++ b/build/log/CMakeLists.txt
@@ -56,7 +56,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_LOG_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_LOG_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES ${DPL_LOG_HEADERS}
         DESTINATION include/dpl-efl/dpl/log)

diff --git a/build/log/dpl-log-efl.pc.in b/build/log/dpl-log-efl.pc.in
index 7f1868908a7fd8e90e68dc8375fd0db2f2857915..ef14ab9ce499109c91eb7c2fd361c8066f63cf58 100644 (file)
--- a/build/log/dpl-log-efl.pc.in
+++ b/build/log/dpl-log-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-log-efl

diff --git a/build/rpc/CMakeLists.txt b/build/rpc/CMakeLists.txt
index 9c52217cc9410a8d2fcdb4fd7ac6fa1f13d62ac7..0aad4dd2646e5e7739763f6e1eae96fec45328b9 100644 (file)
--- a/build/rpc/CMakeLists.txt
+++ b/build/rpc/CMakeLists.txt
@@ -65,7 +65,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_RPC_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_RPC_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_RPC_HEADERS}

diff --git a/build/rpc/dpl-rpc-efl.pc.in b/build/rpc/dpl-rpc-efl.pc.in
index d857bbea20fdd42315e066f1b9572f3cb8495c43..d1e90f25c364fe246054868ca07b6d8d639722c7 100644 (file)
--- a/build/rpc/dpl-rpc-efl.pc.in
+++ b/build/rpc/dpl-rpc-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-rpc-efl

diff --git a/build/security_origin_dao/wrt-commons-security-origin-dao.pc.in b/build/security_origin_dao/wrt-commons-security-origin-dao.pc.in
index 2ab81cbc6ed0b94bbaf14b9b248ebae2bb8212ff..a618ee4e624271c870520c2b6baaf2bb09d94760 100644 (file)
--- a/build/security_origin_dao/wrt-commons-security-origin-dao.pc.in
+++ b/build/security_origin_dao/wrt-commons-security-origin-dao.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: wrt-commons-security-origin-dao
 Description: wrt-commons-security-origin-dao

diff --git a/build/socket/CMakeLists.txt b/build/socket/CMakeLists.txt
index 3ef033f5de6da0c65800a42b79f8baf9ae0fa6cd..3fa8ce008d53c002fbfb502d70b9be0de6b76258 100644 (file)
--- a/build/socket/CMakeLists.txt
+++ b/build/socket/CMakeLists.txt
@@ -62,7 +62,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_SOCKET_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_SOCKET_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_SOCKET_HEADERS}

diff --git a/build/socket/dpl-socket-efl.pc.in b/build/socket/dpl-socket-efl.pc.in
index 1e1409a9be967d2ea413b68158c78d4201477c53..5633edbb45b6e6fa0f4b32472f4ad1da508f5729 100644 (file)
--- a/build/socket/dpl-socket-efl.pc.in
+++ b/build/socket/dpl-socket-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-socket-efl

diff --git a/build/support/wrt-plugins-types.pc.in b/build/support/wrt-plugins-types.pc.in
index b35b9b407328e3fffce3895e33a96c9c783b0f5d..0c1957727f3502964509960be9c7bfcb448cd011 100644 (file)
--- a/build/support/wrt-plugins-types.pc.in
+++ b/build/support/wrt-plugins-types.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: wrt-plugins-types

diff --git a/build/test/CMakeLists.txt b/build/test/CMakeLists.txt
index 710fc4e58c74e39a8dd031ba9b39e1b778f32607..2e0fe01d68a45beeab4443104da8ed9e34c0b7bd 100644 (file)
--- a/build/test/CMakeLists.txt
+++ b/build/test/CMakeLists.txt
@@ -59,7 +59,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_TEST_ENGINE_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_TEST_ENGINE_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_TEST_ENGINE_HEADERS}

diff --git a/build/test/dpl-test-efl.pc.in b/build/test/dpl-test-efl.pc.in
index 9d6f8712903ef1175bdebf09bbae85159accd581..41518c81afdefbf1ae1e968ea6a01a958f88768b 100644 (file)
--- a/build/test/dpl-test-efl.pc.in
+++ b/build/test/dpl-test-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-test-efl

diff --git a/build/utils/CMakeLists.txt b/build/utils/CMakeLists.txt
index ccc52ae0d3b47ebcb568c616afb7d00b675d9e6d..64f6703fe42eaa8883f640c9cd9dcf188417bf02 100644 (file)
--- a/build/utils/CMakeLists.txt
+++ b/build/utils/CMakeLists.txt
@@ -71,7 +71,7 @@ SET_TARGET_PROPERTIES(${TARGET_DPL_UTILS_EFL} PROPERTIES
 
 # Install libraries
 INSTALL(TARGETS ${TARGET_DPL_UTILS_EFL}
-        DESTINATION lib)
+        DESTINATION ${LIB_INSTALL_DIR})
 
 # Install detail headers
 INSTALL(FILES ${DPL_UTILS_HEADERS}

diff --git a/build/utils/dpl-utils-efl.pc.in b/build/utils/dpl-utils-efl.pc.in
index 8e1d4c9f2a4083d5feeda85f293a92160401811f..17d31ef98afe695f9d4a73428e8e2955aaa9e04b 100644 (file)
--- a/build/utils/dpl-utils-efl.pc.in
+++ b/build/utils/dpl-utils-efl.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: dpl-utils-efl

diff --git a/build/widget_dao/dpl-wrt-dao-ro.pc.in b/build/widget_dao/dpl-wrt-dao-ro.pc.in
index d2d112b2653c6ba5b7bc48e0d462238793610662..c2bf17a50cdef87a9f3bc2229a1aa40685c1ccb9 100644 (file)
--- a/build/widget_dao/dpl-wrt-dao-ro.pc.in
+++ b/build/widget_dao/dpl-wrt-dao-ro.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: dpl-wrt-dao-ro
 Description: dpl-wrt-dao-ro

diff --git a/build/widget_dao/dpl-wrt-dao-rw.pc.in b/build/widget_dao/dpl-wrt-dao-rw.pc.in
index c71e58d13c3f363aefff1bccfde4af43cd20681b..0618fea11606bd56fc93c2b2cbb9cbb3a37de7d4 100644 (file)
--- a/build/widget_dao/dpl-wrt-dao-rw.pc.in
+++ b/build/widget_dao/dpl-wrt-dao-rw.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
 
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 Name: dpl-wrt-dao-rw
 Description: dpl-wrt-dao-rw

diff --git a/modules/certificate_dao/CMakeLists.txt b/modules/certificate_dao/CMakeLists.txt
index f55ee45ed897dda9bad6624e5eb00b2fb192d82d..067603e6f1fc3f8df338039f10b065b1d6c13af6 100755 (executable)
--- a/modules/certificate_dao/CMakeLists.txt
+++ b/modules/certificate_dao/CMakeLists.txt
@@ -46,7 +46,7 @@ SET_TARGET_PROPERTIES(${TARGET_CERTIFICATE_DAO_LIB} PROPERTIES SOVERSION ${API_V
 TARGET_LINK_LIBRARIES(${TARGET_CERTIFICATE_DAO_LIB} ${TARGET_DPL_EFL} ${TARGET_DPL_DB_EFL} ${TARGET_WRT_DAP_RO_LIB} ${CERTIFICATE_DAO_DEPS_LIBRARIES})
 ADD_DEPENDENCIES(${TARGET_CERTIFICATE_DAO_LIB} ${TARGET_CERTIFICATE_DAO_DB})
 
-INSTALL(TARGETS ${TARGET_CERTIFICATE_DAO_LIB} DESTINATION lib)
+INSTALL(TARGETS ${TARGET_CERTIFICATE_DAO_LIB} DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     include/wrt-commons/certificate-dao/certificate_dao_types.h

diff --git a/modules/custom_handler_dao/CMakeLists.txt b/modules/custom_handler_dao/CMakeLists.txt
index 1afddd56bc4549a3ef7c64dbb08ba44c87113141..7954bb776bdeb071abd7ad57320452bcb89fa59b 100644 (file)
--- a/modules/custom_handler_dao/CMakeLists.txt
+++ b/modules/custom_handler_dao/CMakeLists.txt
@@ -67,8 +67,8 @@ SET_TARGET_PROPERTIES(${TARGET_CUSTOM_HANDLER_DAO_RW_LIB} PROPERTIES COMPILE_FLA
 TARGET_LINK_LIBRARIES(${TARGET_CUSTOM_HANDLER_DAO_RW_LIB} ${TARGET_CUSTOM_HANDLER_DAO_RO_LIB})
 ADD_DEPENDENCIES(${TARGET_CUSTOM_HANDLER_DAO_RW_LIB} ${TARGET_CUSTOM_HANDLER_DAO_DB})
 
-INSTALL(TARGETS ${TARGET_CUSTOM_HANDLER_DAO_RO_LIB} DESTINATION lib)
-INSTALL(TARGETS ${TARGET_CUSTOM_HANDLER_DAO_RW_LIB} DESTINATION lib)
+INSTALL(TARGETS ${TARGET_CUSTOM_HANDLER_DAO_RO_LIB} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${TARGET_CUSTOM_HANDLER_DAO_RW_LIB} DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     include/wrt-commons/custom-handler-dao-ro/common_dao_types.h

diff --git a/modules/security_origin_dao/CMakeLists.txt b/modules/security_origin_dao/CMakeLists.txt
index 4e74cc310d65008abb2346b379007514acb6fb74..337807372a44668033a051cbcc4062c1464c2455 100644 (file)
--- a/modules/security_origin_dao/CMakeLists.txt
+++ b/modules/security_origin_dao/CMakeLists.txt
@@ -46,7 +46,7 @@ SET_TARGET_PROPERTIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} PROPERTIES SOVERSION ${A
 TARGET_LINK_LIBRARIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} ${TARGET_DPL_EFL} ${TARGET_DPL_DB_EFL} ${TARGET_WRT_DAP_RO_LIB} ${SECURITY_ORIGIN_DAO_DEPS_LIBRARIES})
 ADD_DEPENDENCIES(${TARGET_SECURITY_ORIGIN_DAO_LIB} ${TARGET_SECURITY_ORIGIN_DAO_DB})
 
-INSTALL(TARGETS ${TARGET_SECURITY_ORIGIN_DAO_LIB} DESTINATION lib)
+INSTALL(TARGETS ${TARGET_SECURITY_ORIGIN_DAO_LIB} DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     include/wrt-commons/security-origin-dao/security_origin_dao_types.h

diff --git a/modules/widget_dao/CMakeLists.txt b/modules/widget_dao/CMakeLists.txt
index 1c58aa990b5465c1567cecf8724e27a12b557098..4688e4fa152540f120ee1d827aa94eaa8390560f 100755 (executable)
--- a/modules/widget_dao/CMakeLists.txt
+++ b/modules/widget_dao/CMakeLists.txt
@@ -111,10 +111,10 @@ target_link_libraries(${TARGET_WRT_DAO_RW_LIB}
 ADD_DEPENDENCIES(${TARGET_WRT_DAO_RW_LIB} ${TARGET_WRT_DAO_DB})
 
 INSTALL(TARGETS ${TARGET_WRT_DAO_RO_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(TARGETS ${TARGET_WRT_DAO_RW_LIB}
-    DESTINATION lib)
+    DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(FILES
     include/dpl/wrt-dao-ro/config_parser_data.h

diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h b/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
index 3b9ca41333c1e3bb4dc02d803f2bdfa632127834..14051db8eaad7d9934973dd23781259101096b92 100644 (file)
--- a/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h
@@ -49,7 +49,7 @@ inline const char* GetWrtWidgetInterfaceDatabaseFilePath()
  */
 inline const char* GetDevicePluginPath()
 {
-    return "/usr/lib/wrt-plugins";
+    return LIBDIR_PREFIX "/wrt-plugins";
 }
 
 /**

diff --git a/packaging/wrt-commons.spec b/packaging/wrt-commons.spec
index c67845d0568671bcd791464bfe1e3e1f21c6f00c..89a6ed2031f56389073acdf65ff025ea7aea9534 100644 (file)
--- a/packaging/wrt-commons.spec
+++ b/packaging/wrt-commons.spec
@@ -66,7 +66,7 @@ mkdir -p /opt/share/widget/system
 mkdir -p /opt/share/widget/user
 mkdir -p /opt/share/widget/exec
 mkdir -p /opt/share/widget/data/Public
-mkdir -p /usr/lib/wrt-plugins
+mkdir -p %{_libdir}/wrt-plugins
 
 if [ -z ${2} ]; then
     echo "This is new install of wrt-commons"