summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2018-08-16 17:22:14 +0300
committerDaniel Stone <daniels@collabora.com>2018-08-27 10:52:35 +0100
commitd117f33d9b7674e1cb62095e5b252deea5232977 (patch)
tree4f25f3191b0c13b56b91046a49f3e57285d4a07b
parent836b0530914afe4da9a804c945f76c73d1fa1c3f (diff)
man: make substitutions meson-friendly
Change format of substituted variables to follow the pattern used by configure_file() in Meson. This helps the migration to Meson, making man/meson.build much cleaner. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--Makefile.am16
-rw-r--r--man/weston-drm.man2
-rw-r--r--man/weston-rdp.man2
-rw-r--r--man/weston.ini.man16
-rw-r--r--man/weston.man8
5 files changed, 22 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am
index 83bb2533..83546b7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1592,14 +1592,14 @@ man_MANS += weston-rdp.7
endif
MAN_SUBSTS = \
- -e 's|__weston_native_backend__|$(WESTON_NATIVE_BACKEND)|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'
+ -e 's|@weston_native_backend@|$(WESTON_NATIVE_BACKEND)|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-drm.man b/man/weston-drm.man
index f9247b27..6244a823 100644
--- a/man/weston-drm.man
+++ b/man/weston-drm.man
@@ -1,4 +1,4 @@
-.TH WESTON-DRM 7 "2012-11-27" "Weston __version__"
+.TH WESTON-DRM 7 "2012-11-27" "Weston @version@"
.SH NAME
weston-drm \- the DRM backend for Weston
.SH SYNOPSIS
diff --git a/man/weston-rdp.man b/man/weston-rdp.man
index 0916c8d7..f6cdd1de 100644
--- a/man/weston-rdp.man
+++ b/man/weston-rdp.man
@@ -1,4 +1,4 @@
-.TH WESTON-RDP 7 "2017-12-14" "Weston __version__"
+.TH WESTON-RDP 7 "2017-12-14" "Weston @version@"
.SH NAME
weston-rdp \- the RDP backend for Weston
.SH SYNOPSIS
diff --git a/man/weston.ini.man b/man/weston.ini.man
index 199b465c..d4e367a6 100644
--- a/man/weston.ini.man
+++ b/man/weston.ini.man
@@ -1,6 +1,6 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH weston.ini 5 "2013-01-17" "Weston __version__"
+.TH weston.ini 5 "2013-01-17" "Weston @version@"
.SH NAME
weston.ini \- configuration file for
.B Weston
@@ -97,7 +97,7 @@ section is used to select the startup compositor modules and general options.
specifies a shell to load (string). This can be used to load your own
implemented shell or one with Weston as default. Available shells
in the
-.IR "__weston_modules_dir__"
+.IR "@weston_modules_dir@"
directory are:
.PP
.RS 10
@@ -112,7 +112,7 @@ ask Weston to load the XWayland module (boolean).
.TP 7
.BI "modules=" cms-colord.so,screen-share.so
specifies the modules to load (string). Available modules in the
-.IR "__weston_modules_dir__"
+.IR "@weston_modules_dir@"
directory are:
.PP
.RS 10
@@ -124,7 +124,7 @@ directory are:
.TP 7
.BI "backend=" headless-backend.so
overrides defaults backend. Available backend modules in the
-.IR "__libweston_modules_dir__"
+.IR "@libweston_modules_dir@"
directory are:
.PP
.RS 10
@@ -252,7 +252,7 @@ The entries that can appear in this section are:
.TP 7
.BI "client=" file
sets the path for the shell client to run. If not specified
-.I __weston_shell_client__
+.I @weston_shell_client@
is launched (string).
.TP 7
.BI "background-image=" file
@@ -457,7 +457,7 @@ present. This seat can be constrained like any other.
.RE
.SH "INPUT-METHOD SECTION"
.TP 7
-.BI "path=" "__weston_libexecdir__/weston-keyboard"
+.BI "path=" "@weston_libexecdir@/weston-keyboard"
sets the path of the on screen keyboard input method (string).
.RE
.RE
@@ -540,13 +540,13 @@ The terminal shell (string). Sets the $TERM variable.
.RE
.SH "XWAYLAND SECTION"
.TP 7
-.BI "path=" "__xserver_path__"
+.BI "path=" "@xserver_path@"
sets the path to the xserver to run (string).
.RE
.RE
.SH "SCREEN-SHARE SECTION"
.TP 7
-.BI "command=" "__weston_bindir__/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
diff --git a/man/weston.man b/man/weston.man
index 596041df..44a73fa0 100644
--- a/man/weston.man
+++ b/man/weston.man
@@ -1,4 +1,4 @@
-.TH WESTON 1 "2012-11-27" "Weston __version__"
+.TH WESTON 1 "2012-11-27" "Weston @version@"
.SH NAME
weston \- the reference Wayland server
.SH SYNOPSIS
@@ -115,9 +115,9 @@ and
Load
.I backend.so
instead of the default backend. The file is searched for in
-.IR "__weston_modules_dir__" ,
+.IR "@weston_modules_dir@" ,
or you can pass an absolute path. The default backend is
-.I __weston_native_backend__
+.I @weston_native_backend@
unless the environment suggests otherwise, see
.IR DISPLAY " and " WAYLAND_DISPLAY .
.TP
@@ -159,7 +159,7 @@ Ask Weston to load the XWayland module.
\fB\-\-modules\fR=\fImodule1.so,module2.so\fR
Load the comma-separated list of modules. Only used by the test
suite. The file is searched for in
-.IR "__weston_modules_dir__" ,
+.IR "@weston_modules_dir@" ,
or you can pass an absolute path.
.TP
.BR \-\-no-config