[gdm/wip/nielsdg/meson: 1/11] data: switch gdm.service.in to use cmake format

[Ray Strode <halfline src gnome org>]

commit 8e3bcdf13d2c9706882eac9c55df18d3a7457e9d
Author: Ray Strode <rstrode redhat com>
Date:   Thu Apr 30 15:34:43 2020 -0400

    data: switch gdm.service.in to use cmake format
    
    We're going to be switching to meson, and meson doesn't
    deal too well with an @ in the configuration file that's not
    part of a substitution variable.
    
    This commit switches the gdm service over to use a cmake style
    of substitution variables, so we can later tell meson to use
    configure in cmake mode and workaround the @ confusion.

 data/Makefile.am    |  8 ++++----
 data/gdm.service.in | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index bda91604..d55f3e6b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -200,10 +200,10 @@ systemdsystemunit =
 
 gdm.service: $(srcdir)/gdm.service.in
        $(AM_V_GEN)sed \
-               -e 's,[@]sbindir[@],$(sbindir),g' \
-               -e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
-               -e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \
-               -e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \
+               -e 's,[$$]{sbindir},$(sbindir),g' \
+               -e 's,[$$]{GDM_INITIAL_VT},$(GDM_INITIAL_VT),g' \
+               -e 's,[$$]{LANG_CONFIG_FILE},$(LANG_CONFIG_FILE),g' \
+               -e 's,[$$]{PLYMOUTH_QUIT_SERVICE},$(PLYMOUTH_QUIT_SERVICE),g' \
                -e 's, *$$,,g' \
                < $< > $@
 systemdsystemunit += gdm.service
diff --git a/data/gdm.service.in b/data/gdm.service.in
index 57d60ada..fbbfb529 100644
--- a/data/gdm.service.in
+++ b/data/gdm.service.in
@@ -2,15 +2,15 @@
 Description=GNOME Display Manager
 
 # replaces the getty
-Conflicts=getty@tty@GDM_INITIAL_VT@.service
-After=getty@tty@GDM_INITIAL_VT@.service
+Conflicts=getty@tty${GDM_INITIAL_VT}.service
+After=getty@tty${GDM_INITIAL_VT}.service
 
 # replaces plymouth-quit since it quits plymouth on its own
-Conflicts=@PLYMOUTH_QUIT_SERVICE@
-After=@PLYMOUTH_QUIT_SERVICE@
+Conflicts=${PLYMOUTH_QUIT_SERVICE}
+After=${PLYMOUTH_QUIT_SERVICE}
 
 # Needs all the dependencies of the services it's replacing
-# pulled from getty@.service and @PLYMOUTH_QUIT_SERVICE@
+# pulled from getty@.service and ${PLYMOUTH_QUIT_SERVICE}
 # (except for plymouth-quit-wait.service since it waits until
 # plymouth is quit, which we do)
 After=rc-local.service plymouth-start.service systemd-user-sessions.service
@@ -20,14 +20,14 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service
 OnFailure=plymouth-quit.service
 
 [Service]
-ExecStart=@sbindir@/gdm
+ExecStart=${sbindir}/gdm
 KillMode=mixed
 Restart=always
 IgnoreSIGPIPE=no
 BusName=org.gnome.DisplayManager
 StandardOutput=syslog
 StandardError=inherit
-EnvironmentFile=-@LANG_CONFIG_FILE@
+EnvironmentFile=-${LANG_CONFIG_FILE}
 ExecReload=/bin/kill -SIGHUP $MAINPID
 KeyringMode=shared