From df2162d8a0f3a52165793c4d10587e29c95bb6f0 Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Wed, 27 Mar 2013 10:11:23 +0100 Subject: [PATCH] Fix x86-64 compliance -> Fix lib dir for installation -> Fix pc file --- CMakeLists.txt | 4 ++-- build/auto_save_dao/wrt-commons-auto-save-dao-ro.pc.in | 2 +- build/auto_save_dao/wrt-commons-auto-save-dao-rw.pc.in | 2 +- build/auto_save_dao/wrt-commons-auto-save-dao.pc.in | 2 +- build/core/CMakeLists.txt | 2 +- build/core/dpl-efl.pc.in | 2 +- .../wrt-commons-custom-handler-dao-ro.pc.in | 4 ++-- .../wrt-commons-custom-handler-dao-rw.pc.in | 2 +- build/db/CMakeLists.txt | 2 +- build/db/dpl-db-efl.pc.in | 2 +- build/dbus/CMakeLists.txt | 2 +- build/dbus/dpl-dbus-efl.pc.in | 2 +- build/encryption/CMakeLists.txt | 2 +- build/encryption/dpl-encryption.pc.in | 2 +- build/event/CMakeLists.txt | 2 +- build/event/dpl-event-efl.pc.in | 2 +- build/log/CMakeLists.txt | 2 +- build/log/dpl-log-efl.pc.in | 2 +- build/rpc/CMakeLists.txt | 2 +- build/rpc/dpl-rpc-efl.pc.in | 2 +- .../security_origin_dao/wrt-commons-security-origin-dao.pc.in | 2 +- build/socket/CMakeLists.txt | 2 +- build/socket/dpl-socket-efl.pc.in | 2 +- build/support/wrt-plugins-types.pc.in | 2 +- build/test/CMakeLists.txt | 2 +- build/test/dpl-test-efl.pc.in | 2 +- build/utils/CMakeLists.txt | 2 +- build/utils/dpl-utils-efl.pc.in | 2 +- build/widget_dao/dpl-wrt-dao-ro.pc.in | 2 +- build/widget_dao/dpl-wrt-dao-rw.pc.in | 2 +- modules/certificate_dao/CMakeLists.txt | 2 +- modules/custom_handler_dao/CMakeLists.txt | 4 ++-- modules/security_origin_dao/CMakeLists.txt | 2 +- modules/widget_dao/CMakeLists.txt | 4 ++-- modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h | 2 +- packaging/wrt-commons.spec | 2 +- 36 files changed, 40 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd7e778..ca33fdf 100644 --- 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 2784bef..6600968 100644 --- 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 bb4bd70..77589bd 100644 --- 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 11e3ca9..09e0ab4 100644 --- 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 d0e5699..cbe778f 100644 --- 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 6d2a882..d42414a 100644 --- 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 7cda187..2fdf647 100644 --- 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 4cd2737..91975e2 100644 --- 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 29dd495..d4e60fc 100644 --- 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 866bb0f..d68ec91 100644 --- 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 59b2db1..b837a8c 100644 --- 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 73f2c03..52742dc 100644 --- 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 6e643b2..1b6a4a5 100644 --- 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 dfddda3..b1c338c 100644 --- 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 b023e0a..0c00e91 100644 --- 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 d4befbe..fe6eae5 100644 --- 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 47379d5..1e4b9ee 100644 --- 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 7f18689..ef14ab9 100644 --- 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 9c52217..0aad4dd 100644 --- 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 d857bbe..d1e90f2 100644 --- 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 2ab81cb..a618ee4 100644 --- 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 3ef033f..3fa8ce0 100644 --- 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 1e1409a..5633edb 100644 --- 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 b35b9b4..0c19577 100644 --- 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 710fc4e..2e0fe01 100644 --- 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 9d6f871..41518c8 100644 --- 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 ccc52ae..64f6703 100644 --- 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 8e1d4c9..17d31ef 100644 --- 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 d2d112b..c2bf17a 100644 --- 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 c71e58d..0618fea 100644 --- 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 f55ee45..067603e 100755 --- 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 1afddd5..7954bb7 100644 --- 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 4e74cc3..3378073 100644 --- 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 1c58aa9..4688e4f 100755 --- 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 3b9ca41..14051db 100644 --- 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 c67845d..89a6ed2 100644 --- 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" -- 2.34.1