[gnome-disk-utility/wip/inigomartinez/meson: 1/2] build: Created template file for service file



commit 153c3168070026bece488ae0cd530d1e7e66712e
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Sat Jul 15 10:39:41 2017 +0200

    build: Created template file for service file
    
    A template file has been created for the service file, so its
    contents have been removed from the build file.

 data/Makefile.am                      |   10 ++++------
 data/org.gnome.DiskUtility.service.in |    3 +++
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a58fe70..7fa1384 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,13 +15,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 dbusservicedir = $(datadir)/dbus-1/services
-dbusservice_DATA = org.gnome.DiskUtility.service
+dbusservice_in_files = org.gnome.DiskUtility.service.in
+dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
 
-org.gnome.DiskUtility.service: Makefile
-       $(AM_V_GEN) (echo '[D-BUS Service]'; \
-                    echo 'Name=org.gnome.DiskUtility'; \
-                    echo 'Exec=${bindir}/gnome-disks --gapplication-service') > $@.tmp && \
-                    mv $@.tmp $@
+%.service: %.service.in
+       $(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
 
 # GSettings schemas
 gsettings_SCHEMAS =                                            \
diff --git a/data/org.gnome.DiskUtility.service.in b/data/org.gnome.DiskUtility.service.in
new file mode 100644
index 0000000..8afe11f
--- /dev/null
+++ b/data/org.gnome.DiskUtility.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.DiskUtility
+Exec=@bindir@/gnome-disks --gapplication-service


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