From d51acfd73031f4d0d013ba07e61b8a7f7a97d627 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 29 Jun 2017 14:09:43 +1000 Subject: [PATCH] Move ratbagd dbus and tools to top-level directory Signed-off-by: Peter Hutterer --- {ratbagd/dbus => dbus}/org.freedesktop.ratbag1.conf | 0 {ratbagd/dbus => dbus}/org.freedesktop.ratbag1.service.in | 0 meson.build | 8 ++++---- {ratbagd/doc => tools}/ratbagctl.1 | 0 {ratbagd/tools => tools}/ratbagctl.in | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {ratbagd/dbus => dbus}/org.freedesktop.ratbag1.conf (100%) rename {ratbagd/dbus => dbus}/org.freedesktop.ratbag1.service.in (100%) rename {ratbagd/doc => tools}/ratbagctl.1 (100%) rename {ratbagd/tools => tools}/ratbagctl.in (100%) diff --git a/ratbagd/dbus/org.freedesktop.ratbag1.conf b/dbus/org.freedesktop.ratbag1.conf similarity index 100% rename from ratbagd/dbus/org.freedesktop.ratbag1.conf rename to dbus/org.freedesktop.ratbag1.conf diff --git a/ratbagd/dbus/org.freedesktop.ratbag1.service.in b/dbus/org.freedesktop.ratbag1.service.in similarity index 100% rename from ratbagd/dbus/org.freedesktop.ratbag1.service.in rename to dbus/org.freedesktop.ratbag1.service.in diff --git a/meson.build b/meson.build index 047c10e3..aaede045 100644 --- a/meson.build +++ b/meson.build @@ -465,22 +465,22 @@ if dbusdir == '' dbusdir = join_paths(get_option('datadir'), 'dbus-1') endif -configure_file(input : 'ratbagd/dbus/org.freedesktop.ratbag1.service.in', +configure_file(input : 'dbus/org.freedesktop.ratbag1.service.in', output : 'org.freedesktop.ratbag1.service', configuration : config_bindir, install_dir : join_paths(dbusdir, 'system-services')) -install_data('ratbagd/dbus/org.freedesktop.ratbag1.conf', +install_data('dbus/org.freedesktop.ratbag1.conf', configuration : config_bindir, install_dir : join_paths(dbusdir, 'system.d')) #### tools #### config_ratbagctl = configuration_data() config_ratbagctl.set('version', meson.project_version()) -configure_file(input : 'ratbagd/tools/ratbagctl.in', +configure_file(input : 'tools/ratbagctl.in', output : 'ratbagctl', configuration : config_ratbagctl, install_dir : get_option('bindir')) -install_man('ratbagd/doc/ratbagctl.1') +install_man('tools/ratbagctl.1') #### output files #### configure_file(output: 'config.h', install: false, configuration: config_h) diff --git a/ratbagd/doc/ratbagctl.1 b/tools/ratbagctl.1 similarity index 100% rename from ratbagd/doc/ratbagctl.1 rename to tools/ratbagctl.1 diff --git a/ratbagd/tools/ratbagctl.in b/tools/ratbagctl.in similarity index 100% rename from ratbagd/tools/ratbagctl.in rename to tools/ratbagctl.in