[PATCH v2 weston] man: fix prefixes for weston.ini(5)

[Pekka Paalanen]

On Wed, 13 Jun 2018 09:11:48 +1000
Peter Hutterer <peter.hutterer at who-t.net> wrote:

> 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>
> ---
> Turn's out not everything that looks like a quickfix can be done in 5
> minutes :)
> 
> Changes to v1:
> - fix the module dir for the modules (pkglibdir → moduledir)
> - fix the moduledir for the backends (→ libweston_moduledir)
> - substitute the right Xwayland path
> 
>  Makefile.am        | 6 +++++-
>  man/weston.ini.man | 8 ++++----
>  2 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 9d23b50d..d2025bc5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1595,8 +1595,12 @@ endif
>  
>  MAN_SUBSTS =								\
>  	-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_libexecdir__|$(libexecdir)|g' 			\
> +	-e 's|__weston_bindir__|$(bindir)|g' 				\
> +	-e 's|__xserver_path__|$(XSERVER_PATH)|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..027eae0e 100644
> --- a/man/weston.ini.man
> +++ b/man/weston.ini.man
> @@ -124,7 +124,7 @@ directory are:
>  .TP 7
>  .BI "backend=" headless-backend.so
>  overrides defaults backend. Available backend modules in the
> -.IR "__weston_modules_dir__"
> +.IR "__libweston_modules_dir__"
>  directory are:
>  .PP
>  .RS 10
> @@ -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=" "__xserver_path__"
>  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

Pushed:
   a1fd4302..002f0c56  master -> master


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20180613/11e218e4/attachment-0001.sig>