From f5270e153963f7828d14f7c65c88510b194abe9a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 6 Apr 2017 17:28:47 +1000
Subject: [PATCH] Change the sed replacement for meson's benefit

No functional changes

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Makefile.am                             | 6 +++---
 dbus/org.freedesktop.ratbag1.service.in | 2 +-
 python/ratbagctl.py                     | 2 +-
 ratbagd.service.in                      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 218aac46..a3bf3967 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,14 +91,14 @@ unitdir = $(SYSTEMD_UNIT_DIR)
 unit_DATA = ratbagd.service
 
 $(unit_DATA): $(unit_DATA).in
-	$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
+	$(AM_V_GEN)$(SED) -e 's|@bindir@|$(bindir)|g' < $< > $@
 
 dbusservicedir = $(DBUS_SYSTEM_SERVICES_DIR)
 dbusservice_DATA = dbus/org.freedesktop.ratbag1.service
 
 $(dbusservice_DATA): $(dbusservice_DATA).in
 	$(AM_V_GEN)$(MKDIR_P) dbus
-	$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
+	$(AM_V_GEN)$(SED) -e 's|@bindir@|$(bindir)|g' < $< > $@
 
 dbusconfigdir = $(DBUS_SYSTEM_CONFIG_DIR)
 dbusconfig_DATA = dbus/org.freedesktop.ratbag1.conf
@@ -119,7 +119,7 @@ bin_SCRIPTS = \
 
 python/ratbagctl: python/ratbagctl.py
 	$(AM_V_GEN)$(MKDIR_P) python
-	$(AM_V_GEN)$(SED) -e "s/__VERSION__/$(PACKAGE_VERSION)/" < $^ > $@
+	$(AM_V_GEN)$(SED) -e "s/@version@/$(PACKAGE_VERSION)/" < $^ > $@
 
 EXTRA_DIST += python/ratbagctl.py
 BUILT_SOURCES += python/ratbagctl
diff --git a/dbus/org.freedesktop.ratbag1.service.in b/dbus/org.freedesktop.ratbag1.service.in
index 712bbfb2..8cad1c6f 100644
--- a/dbus/org.freedesktop.ratbag1.service.in
+++ b/dbus/org.freedesktop.ratbag1.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.ratbag1
-Exec=__BIN_PREFIX__/ratbagd
+Exec=@bindir@/ratbagd
 User=root
 SystemdService=dbus-org.freedesktop.ratbag1.service
diff --git a/python/ratbagctl.py b/python/ratbagctl.py
index 78e6857e..3c672236 100755
--- a/python/ratbagctl.py
+++ b/python/ratbagctl.py
@@ -154,7 +154,7 @@ def show_button(r, args):
 
 def make_parser():
     parser = argparse.ArgumentParser(description="Inspect and modify configurable mice")
-    parser.add_argument("-V", "--version", action="version", version="__VERSION__")
+    parser.add_argument("-V", "--version", action="version", version="@version@")
     subs = parser.add_subparsers(title="COMMANDS", help=None)
 
     list = subs.add_parser("list-devices", help="List available configurable mice")
diff --git a/ratbagd.service.in b/ratbagd.service.in
index 600ab8c0..e6f6eb9f 100644
--- a/ratbagd.service.in
+++ b/ratbagd.service.in
@@ -4,7 +4,7 @@ Description=Daemon to introspect and modify configurable mice
 [Service]
 Type=dbus
 BusName=org.freedesktop.ratbag1
-ExecStart=__BIN_PREFIX__/ratbagd
+ExecStart=@bindir@/ratbagd
 Restart=on-abort
 
 [Install]