[gedit] build: improve a little service file handling
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] build: improve a little service file handling
- Date: Thu, 5 Dec 2019 10:47:16 +0000 (UTC)
commit 698bf9c362b38ce0ec318c0704668dea3b948cc0
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Dec 5 11:42:06 2019 +0100
build: improve a little service file handling
Avoid the use of global variables (bindir and dbusdir).
data/meson.build | 7 ++-----
meson.build | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 32004cbbc..657716cc4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -81,14 +81,11 @@ if xmllint.found()
endif
service_in = configuration_data()
-service_in.set('bindir', bindir)
+service_in.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
configure_file(
input: 'org.gnome.gedit.service.in',
output: 'org.gnome.gedit.service',
configuration: service_in,
- install_dir: join_paths(
- dbusdir,
- 'services',
- )
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1/services')
)
diff --git a/meson.build b/meson.build
index 769cfb843..bc88ecaed 100644
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,6 @@ pkgconfigdir = join_paths(libdir, 'pkgconfig')
pkglibdir = join_paths(libdir, meson.project_name())
pkgdatadir = join_paths(datadir, meson.project_name())
-dbusdir = join_paths(datadir, 'dbus-1')
glibdir = join_paths(datadir, 'glib-2.0')
gtkdocdir = join_paths(datadir, 'gtk-doc')
vapidir = join_paths(datadir, 'vala', 'vapi')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]