From c40e0e47875258771ccf2e99d3adec263f1b3692 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sun, 12 Jan 2020 16:37:42 +0100
Subject: [PATCH] Consistently use @ as token delimiter in .in files

---
 docs/Makefile.am | 4 ++--
 docs/e16.man.in  | 4 ++--
 misc/Makefile.am | 2 +-
 misc/starte16.in | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8964f7b3..82fdac0c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -6,8 +6,8 @@ CLEANFILES = e16.1
 MAINTAINERCLEANFILES = e16.html
 
 MANSUBST = \
-	-e "s=%VERSION%=${VERSION}=" \
-	-e "s=%DOCDIR%=$(e16docdir)="
+	-e "s=\@VERSION\@=${VERSION}=" \
+	-e "s=\@DOCDIR\@=$(e16docdir)="
 
 e16.1: e16.man.in
 	sed $(MANSUBST) $< > $@
diff --git a/docs/e16.man.in b/docs/e16.man.in
index 6871a7ef..aac1b14c 100644
--- a/docs/e16.man.in
+++ b/docs/e16.man.in
@@ -1,4 +1,4 @@
-.TH e16 1 %VERSION%
+.TH e16 1 @VERSION@
 .SH NAME
 e16 \- The Enlightenment DR16 window manager
 
@@ -43,7 +43,7 @@ Print e16 version and exit.
 Start e16 running within a window. Mostly for debugging.
 
 .SH "SEE ALSO"
-%DOCDIR%/e16.html
+@DOCDIR@/e16.html
 .\".br
 .\"eesh(1)
 
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 6c369fa7..5cb2bff5 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -41,7 +41,7 @@ CLEANFILES = $(DESKTOPS_APP) $(XSESSION_MISC) $(XSESSION_GNOME2) starte16
 starte16: $(srcdir)/starte16.in Makefile
 
 starte16:
-	sed -e "s=%bindir%=${bindir}=" $(srcdir)/$@.in > $@
+	sed -e "s=\@bindir\@=${bindir}=" $(srcdir)/$@.in > $@
 
 e16.desktop: $(srcdir)/e16.desktop.in Makefile
 e16-gnome.desktop: $(srcdir)/e16-gnome.desktop.in Makefile
diff --git a/misc/starte16.in b/misc/starte16.in
index e6390bf7..e9b580b8 100755
--- a/misc/starte16.in
+++ b/misc/starte16.in
@@ -16,9 +16,9 @@ case "$s" in
 	exec startkde
 	;;
 *window)
-	exec %bindir%/e16 -w ${SIZE:-800x600}
+	exec @bindir@/e16 -w ${SIZE:-800x600}
 	;;
 *)
-	exec %bindir%/e16
+	exec @bindir@/e16
 	;;
 esac