[recipes] Subsitute @bindir@@ as well
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Subsitute @bindir@@ as well
- Date: Wed, 22 Feb 2017 02:56:59 +0000 (UTC)
commit d908566c0362726989dab30556cc94b7d34e6a60
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Feb 21 21:56:17 2017 -0500
Subsitute @bindir@@ as well
This is used (somewhat pointlessly) in the d-bus service file.
meson.build | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/meson.build b/meson.build
index e92f149..88bd392 100644
--- a/meson.build
+++ b/meson.build
@@ -69,6 +69,7 @@ deps = [ dependency('gtk+-3.0', version : '>=3.20'),
pkgdatadir = join_paths([ get_option('prefix'),
get_option('datadir'),
'gnome-recipes' ])
+bindir = join_paths([ get_option('prefix'), 'bin' ])
conf.set_quoted('G_LOG_DOMAIN', 'org.gnome.Recipes')
conf.set_quoted('PACKAGE_NAME', 'gnome-recipes')
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
@@ -77,8 +78,10 @@ conf.set_quoted('PKGDATADIR', pkgdatadir)
conf.set_quoted('LOCALEDIR', join_paths([ get_option('prefix'),
get_option('datadir'),
'locale' ]))
-# Used while generating cuisine.css
+
+# Used while generating cuisine.css and the dbus service file
conf.set('pkgdatadir', pkgdatadir)
+conf.set('bindir', bindir)
configure_file(output : 'config.h', configuration : conf)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]