mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

man: fix prefixes for weston.ini(5)

Browse Source 
Replace a few hardcoded paths with the substitutes

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Peter Hutterer
2018-06-13 09:11:48 +10:00
committed by Pekka Paalanen
parent a1fd4302bc
commit 002f0c56e0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+5 -1
View File
@@ -1595,8 +1595,12 @@ endif
MAN_SUBSTS = \ MAN_SUBSTS = \
-e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g' \ -e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|g' \
-e 's|__weston_modules_dir__|$(pkglibdir)|g' \ -e 's|__weston_modules_dir__|$(moduledir)|g' \
-e 's|__libweston_modules_dir__|$(libweston_moduledir)|g' \
-e 's|__weston_shell_client__|$(WESTON_SHELL_CLIENT)|g' \ -e 's|__weston_shell_client__|$(WESTON_SHELL_CLIENT)|g' \
-e 's|__weston_libexecdir__|$(libexecdir)|g' \
-e 's|__weston_bindir__|$(bindir)|g' \
-e 's|__xserver_path__|$(XSERVER_PATH)|g' \
-e 's|__version__|$(PACKAGE_VERSION)|g' -e 's|__version__|$(PACKAGE_VERSION)|g'
SUFFIXES = .1 .5 .7 .man SUFFIXES = .1 .5 .7 .man
man/weston.ini.man
+4 -4
View File
@@ -124,7 +124,7 @@ directory are:
.TP 7 .TP 7
.BI "backend=" headless-backend.so .BI "backend=" headless-backend.so
overrides defaults backend. Available backend modules in the overrides defaults backend. Available backend modules in the
.IR "__weston_modules_dir__" .IR "__libweston_modules_dir__"
directory are: directory are:
.PP .PP
.RS 10 .RS 10
@@ -477,7 +477,7 @@ present. This seat can be constrained like any other.
.RE .RE
.SH "INPUT-METHOD SECTION" .SH "INPUT-METHOD SECTION"
.TP 7 .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). sets the path of the on screen keyboard input method (string).
.RE .RE
.RE .RE
@@ -560,13 +560,13 @@ The terminal shell (string). Sets the $TERM variable.
.RE .RE
.SH "XWAYLAND SECTION" .SH "XWAYLAND SECTION"
.TP 7 .TP 7
.BI "path=" "/usr/bin/Xwayland" .BI "path=" "__xserver_path__"
sets the path to the xserver to run (string). sets the path to the xserver to run (string).
.RE .RE
.RE .RE
.SH "SCREEN-SHARE SECTION" .SH "SCREEN-SHARE SECTION"
.TP 7 .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" --shell=fullscreen-shell.so --no-clients-resize"
sets the command to start a fullscreen-shell server for screen sharing (string). sets the command to start a fullscreen-shell server for screen sharing (string).
.RE .RE