[PATCH weston 2/3] man: fix prefixes for weston.ini(5)

Peter Hutterer peter.hutterer at who-t.net
Sun Jun 10 23:57:05 UTC 2018


Replace a few hardcoded paths with the substitutes

https://gitlab.freedesktop.org/wayland/weston/issues/105

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Makefile.am        | 2 ++
 man/weston.ini.man | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9d23b50d..248f0319 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1597,6 +1597,8 @@ MAN_SUBSTS =								\
 	-e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g'	\
 	-e 's|__weston_modules_dir__|$(pkglibdir)|g'			\
 	-e 's|__weston_shell_client__|$(WESTON_SHELL_CLIENT)|g'		\
+	-e 's|__weston_libexecdir__|$(libexecdir)|g' 			\
+	-e 's|__weston_bindir__|$(bindir)|g' 				\
 	-e 's|__version__|$(PACKAGE_VERSION)|g'
 
 SUFFIXES = .1 .5 .7 .man
diff --git a/man/weston.ini.man b/man/weston.ini.man
index b5668b5a..b6bf842f 100644
--- a/man/weston.ini.man
+++ b/man/weston.ini.man
@@ -477,7 +477,7 @@ present. This seat can be constrained like any other.
 .RE
 .SH "INPUT-METHOD SECTION"
 .TP 7
-.BI "path=" "/usr/libexec/weston-keyboard"
+.BI "path=" "__weston_libexecdir__/weston-keyboard"
 sets the path of the on screen keyboard input method (string).
 .RE
 .RE
@@ -560,13 +560,13 @@ The terminal shell (string). Sets the $TERM variable.
 .RE
 .SH "XWAYLAND SECTION"
 .TP 7
-.BI "path=" "/usr/bin/Xwayland"
+.BI "path=" "__weston_bindir__/Xwayland"
 sets the path to the xserver to run (string).
 .RE
 .RE
 .SH "SCREEN-SHARE SECTION"
 .TP 7
-.BI "command=" "/usr/bin/weston --backend=rdp-backend.so \
+.BI "command=" "__weston_bindir__/weston --backend=rdp-backend.so \
 --shell=fullscreen-shell.so --no-clients-resize"
 sets the command to start a fullscreen-shell server for screen sharing (string).
 .RE
-- 
2.14.4



More information about the wayland-devel mailing list