[gnome-builder] dbus: fix dbus activation of org.gnome.Builder



commit bfcc44b84cf85070ce0f1d454fcfee415ebaa4c7
Author: Christian Hergert <christian hergert me>
Date:   Wed Dec 17 20:29:23 2014 -0800

    dbus: fix dbus activation of org.gnome.Builder
    
    @bindir@ was not getting fully expanded, instead it was expanding to
    ${exec_dir}. This forces it using a sed expansion.
    
    This should fix executing Builder from the icon in gnome-shell.

 configure.ac                      |    1 -
 data/data.mk                      |    5 +++++
 data/org.gnome.Builder.service.in |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dbcfd26..3f0c0a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ GTK_DOC_CHECK
 AC_CONFIG_FILES([
        Makefile
        data/icons/Makefile
-       data/org.gnome.Builder.service
        data/org.gnome.builder.editor.gschema.xml
        data/org.gnome.builder.editor.language.gschema.xml
 ])
diff --git a/data/data.mk b/data/data.mk
index 2678992..e5bcad7 100644
--- a/data/data.mk
+++ b/data/data.mk
@@ -15,3 +15,8 @@ CLEANFILES += $(service_DATA)
 styledir = $(datadir)/gtksourceview-3.0/styles/
 style_DATA = data/styles/builder.xml
 EXTRA_DIST += $(style_DATA)
+
+data/org.gnome.Builder.service: data/org.gnome.Builder.service.in
+       $(AM_V_GEN)     \
+               [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
+               sed -e "s|\ bindir\@|$(bindir)|" $< > $  tmp && mv $  tmp $@
diff --git a/data/org.gnome.Builder.service.in b/data/org.gnome.Builder.service.in
index a55bed4..4742068 100644
--- a/data/org.gnome.Builder.service.in
+++ b/data/org.gnome.Builder.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.gnome.Builder
 Exec= bindir@/gnome-builder --gapplication-service
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]