[recipes/recipes-1.0] Use the full path in the service file again



commit c10729f7ace3851f35d94ad64c8683dbd160d2ca
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 1 23:19:56 2017 -0400

    Use the full path in the service file again
    
    Leaving it out works ok for flatpak, since the Exec
    line gets rewritten anyway. But it fails for unsandboxed
    use, which still happens.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=780821

 data/org.gnome.Recipes.service.in |    2 +-
 meson.build                       |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/data/org.gnome.Recipes.service.in b/data/org.gnome.Recipes.service.in
index d6281ae..3fb63e2 100644
--- a/data/org.gnome.Recipes.service.in
+++ b/data/org.gnome.Recipes.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Recipes
-Exec=gnome-recipes --gapplication-service
+Exec=@bindir@/gnome-recipes --gapplication-service
diff --git a/meson.build b/meson.build
index ceea01e..173530d 100644
--- a/meson.build
+++ b/meson.build
@@ -96,7 +96,9 @@ conf.set_quoted('LOCALEDIR', join_paths([ get_option('prefix'),
 
 # Used while generating cuisine.css and the dbus service file
 conf.set_quoted('pkgdatadir', pkgdatadir)
-conf.set_quoted('bindir', bindir)
+
+# used in the service file, must be unquoted
+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]