[phodav: 2/8] build-sys: move data-related meson declarations
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [phodav: 2/8] build-sys: move data-related meson declarations
- Date: Thu, 12 Mar 2020 00:09:32 +0000 (UTC)
commit 2e5190e43f1a4810f40d58388fc6e487fd84cee3
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Thu Mar 5 12:46:44 2020 +0100
build-sys: move data-related meson declarations
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
data/meson.build | 16 ++++++++++++++++
meson.build | 16 ----------------
2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 1835d31..fa29171 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,19 @@
+systemd = dependency('systemd', required : get_option('systemd'))
+if systemd.found()
+ install_data(
+ 'spice-webdavd.service',
+ install_dir : systemd.get_pkgconfig_variable('systemdsystemunitdir')
+ )
+endif
+
+udev = dependency('udev', required : get_option('udev'))
+if udev.found()
+ install_data(
+ '70-spice-webdavd.rules',
+ install_dir : '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d'),
+ )
+endif
+
buildid = get_option('build-id')
version = proj_version.split('.')
maj = version[0].to_int()
diff --git a/meson.build b/meson.build
index f9b5593..84e8bbd 100644
--- a/meson.build
+++ b/meson.build
@@ -47,22 +47,6 @@ if d1.found() and d2.found()
conf.set('WITH_AVAHI', 1)
endif
-systemd = dependency('systemd', required : get_option('systemd'))
-if systemd.found()
- install_data(
- 'data/spice-webdavd.service',
- install_dir : systemd.get_pkgconfig_variable('systemdsystemunitdir')
- )
-endif
-
-udev = dependency('udev', required : get_option('udev'))
-if udev.found()
- install_data(
- 'data/70-spice-webdavd.rules',
- install_dir : '@0@/@1@'.format(udev.get_pkgconfig_variable('udevdir'), 'rules.d'),
- )
-endif
-
if compiler.has_header('attr/xattr.h')
conf.set('HAVE_ATTR_XATTR_H', 1)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]