diff --git a/install.pri b/install.pri index 4bad1baab..4a7653d31 100644 --- a/install.pri +++ b/install.pri @@ -154,7 +154,7 @@ win32-g++ { DBUS_CONFIG_SOURCE_DIR = $$SourceRoot DBUS_CONFIG_FILES *= etc/dbus-1/* - dbus_config_target.path = $${PREFIX}/etc/dbus-1 + dbus_config_target.path = $${PREFIX}/share/dbus-1 } win32-msvc2015 { @@ -169,7 +169,7 @@ win32-msvc2015 { DBUS_CONFIG_SOURCE_DIR = $$SourceRoot DBUS_CONFIG_FILES *= etc/dbus-1/* - dbus_config_target.path = $${PREFIX}/etc/dbus-1 + dbus_config_target.path = $${PREFIX}/share/dbus-1 } macx { @@ -180,7 +180,7 @@ macx { DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1 DBUS_CONFIG_FILES *= session.conf DBUS_CONFIG_FILES *= system.conf - dbus_config_target.path = $${PREFIX}/etc/dbus-1 + dbus_config_target.path = $${PREFIX}/share/dbus-1 } for (BINARY, DBUS_BINARIES) { diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml index 0de76713a..4153a7910 100644 --- a/installer/installbuilder/qt5-binaries.xml +++ b/installer/installbuilder/qt5-binaries.xml @@ -63,17 +63,6 @@ - - etc - ${installdir}/ - etc - windows - - - ../../dist/etc - - - lib ${installdir}/lib diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index 43ec86fed..b52e70787 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -105,9 +105,9 @@ namespace BlackMisc void CDBusServer::launchDBusDaemon() { - const QString program = QStringLiteral("dbus-daemon"); - const QStringList arguments = { QStringLiteral("--config-file=../etc/dbus-1/session.conf") }; - bool success = CProcessCtrl::startDetached(program, arguments, false); + static const QString program = QStringLiteral("dbus-daemon"); + static const QStringList arguments = { QStringLiteral("--session") }; + const bool success = CProcessCtrl::startDetached(program, arguments, false); if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); } }