[evince/wip/hadess/more-dbus-names: 3/3] shell: Don't reference systemd service

[Germán Poo-Caamaño <gpoo src gnome org>]

commit ea46cb534e47315cdcfcd6c48f6cc6e875414198
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Sep 22 12:05:29 2018 +0200

    shell: Don't reference systemd service
    
    It doesn't get exported outside the sandbox, so the session systemd
    doesn't know how to start it. The information in the systemd .service
    file should be enough for systemd to correlate the two when running
    outside the sandbox.

 data/Makefile.am                        | 10 +---------
 data/org.gnome.Evince.Daemon.service.in |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 777ed728..22b84481 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -44,20 +44,12 @@ systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
 
 $(systemd_user_DATA): $(systemd_user_in_files) Makefile
        $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+endif
 
 $(service_DATA): $(service_in_files) Makefile
        $(AM_V_GEN) $(SED) \
                -e "s|\@libexecdir\@|$(libexecdir)|" \
-               -e "s|@if_systemd_service@||" \
                $< > $@
-else
-$(service_DATA): $(service_in_files) Makefile
-       $(AM_V_GEN) $(SED) \
-               -e "s|\@libexecdir\@|$(libexecdir)|" \
-               -e "s|@if_systemd_service@|#|" \
-               $< > $@
-endif
-
 endif
 
 #
diff --git a/data/org.gnome.Evince.Daemon.service.in b/data/org.gnome.Evince.Daemon.service.in
index 8171b099..c51f3bf0 100644
--- a/data/org.gnome.Evince.Daemon.service.in
+++ b/data/org.gnome.Evince.Daemon.service.in
@@ -1,4 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Evince.Daemon
 Exec=@libexecdir@/evinced
-@if_systemd_service@SystemdService=org.gnome.Evince.service