From cd2df61ce0d2564f01c8e013ba125fc01bcd9b1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Thu, 12 Oct 2017 22:40:35 +0200 Subject: [PATCH] provide access to systemd system MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I1e3d2dc780a1449f2bfc894baa1f26a94be61cd8 Signed-off-by: José Bollo --- conf/CMakeLists.txt | 2 ++ conf/afm-system-daemon.conf | 13 ++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt index ad2090d..714c321 100644 --- a/conf/CMakeLists.txt +++ b/conf/CMakeLists.txt @@ -25,10 +25,12 @@ configure_file(afm-system-daemon.socket.in afm-system-daemon.socket) configure_file(afm-user-daemon.service.in afm-user-daemon.service) if(NOT USE_SDK) + set(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d CACHE STRING "Path to dbus system configuration files") set(SYSCONFDIR_DBUS_USER ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/session.d CACHE STRING "Path to dbus session configuration files") set(UNITDIR_SYSTEM ${CMAKE_INSTALL_LIBDIR}/systemd/system CACHE STRING "Path to systemd system unit files") set(UNITDIR_USER ${CMAKE_INSTALL_LIBDIR}/systemd/user CACHE STRING "Path to systemd system unit files") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-system-daemon.conf DESTINATION ${SYSCONFDIR_DBUS_SYSTEM}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service DESTINATION ${UNITDIR_SYSTEM}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket DESTINATION ${UNITDIR_SYSTEM}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-user-daemon.conf DESTINATION ${SYSCONFDIR_DBUS_USER}) diff --git a/conf/afm-system-daemon.conf b/conf/afm-system-daemon.conf index 9527435..18d45fb 100644 --- a/conf/afm-system-daemon.conf +++ b/conf/afm-system-daemon.conf @@ -19,14 +19,9 @@ --> - - - - - - - - - + + + + -- 2.16.6