From d8e3a13f41b2c09566bb096789941ef2cec4a279 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 23 Dec 2016 11:01:46 -0800 Subject: [PATCH] Substitute directories in manual pages --- docs/man/sesman.ini.5.in | 2 +- docs/man/xrdp-genkeymap.8.in | 2 +- docs/man/xrdp-keygen.8.in | 6 +++--- docs/man/xrdp-sesman.8.in | 10 +++++----- docs/man/xrdp-sesrun.8.in | 4 ++-- docs/man/xrdp.8.in | 8 ++++---- docs/man/xrdp.ini.5.in | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/man/sesman.ini.5.in b/docs/man/sesman.ini.5.in index 747bd15e..28da6ce4 100644 --- a/docs/man/sesman.ini.5.in +++ b/docs/man/sesman.ini.5.in @@ -214,7 +214,7 @@ All entries in the \fB[SessionVariables]\fR section are set as environment variables in the user's session. .SH "FILES" -/etc/xrdp/sesman.ini +@sysconfdir@/xrdp/sesman.ini .SH "SEE ALSO" .BR xrdp-sesman (8), diff --git a/docs/man/xrdp-genkeymap.8.in b/docs/man/xrdp-genkeymap.8.in index e69d6606..c0261051 100644 --- a/docs/man/xrdp-genkeymap.8.in +++ b/docs/man/xrdp-genkeymap.8.in @@ -21,7 +21,7 @@ The key map information is stored in the file named \fIoutfile\fP. .SH "FILES" .TP -.I /etc/xrdp/km-XXXXXXXX.ini +.I @sysconfdir@/xrdp/km-XXXXXXXX.ini Files containing the keyboard mapping for language \fIXXXXXXXX\fP, which is a 8 digit hexadecimal number identifying the country and language code. .RS 8 .TP diff --git a/docs/man/xrdp-keygen.8.in b/docs/man/xrdp-keygen.8.in index ce33063c..32d32458 100644 --- a/docs/man/xrdp-keygen.8.in +++ b/docs/man/xrdp-keygen.8.in @@ -15,7 +15,7 @@ xrdp\-keygen \- xrdp RSA key generation utility .SH DESCRIPTION \fBxrdp\-keygen\fP generates the file -.I /etc/xrdp/rsakeys.ini +.I @sysconfdir@/xrdp/rsakeys.ini which contains the RSA key pair used to perform authentication to remote clients. The public key is self-signed. @@ -26,14 +26,14 @@ This program takes one of the following options: Generate a new key pair. The key data is stored in the file named \fIoutfile\fP. .br -If \fBauto\fP is used as \fIoutfile\fP, the default file \fI/etc/xrdp/rsakeys.ini\fP gets created if it does not yet exists. +If \fBauto\fP is used as \fIoutfile\fP, the default file \fI@sysconfdir@/xrdp/rsakeys.ini\fP gets created if it does not yet exists. .TP .B test Generate a test key pair and print information to standard output. .SH FILES .TP -.I /etc/xrdp/rsakeys.ini +.I @sysconfdir@/xrdp/rsakeys.ini RSA public and private key pair used to identify this XRDP server. .SH SEE ALSO diff --git a/docs/man/xrdp-sesman.8.in b/docs/man/xrdp-sesman.8.in index 3b98cf0e..73c8ee42 100644 --- a/docs/man/xrdp-sesman.8.in +++ b/docs/man/xrdp-sesman.8.in @@ -23,15 +23,15 @@ Kills running \fBxrdp\-sesman\fR daemon. Output help information and exit. .SH "FILES" -${SESMAN_BIN_DIR}/sesman +@bindir@/sesman .br -${SESMAN_BIN_DIR}/sesrun +@bindir@/sesrun .br -${SESMAN_CFG_DIR}/sesman.ini +@sysconfdir@/xrdp/sesman.ini .br -${SESMAN_LOG_DIR}/sesman.log +@localstatedir@/log/sesman.log .br -${SESMAN_PID_DIR}/sesman.pid +@localstatedir@/run/sesman.pid .SH "AUTHORS" Jay Sorg diff --git a/docs/man/xrdp-sesrun.8.in b/docs/man/xrdp-sesrun.8.in index 1102bdda..86e9129d 100644 --- a/docs/man/xrdp-sesrun.8.in +++ b/docs/man/xrdp-sesrun.8.in @@ -32,9 +32,9 @@ Screen height Session color depth .SH "FILES" -${SESMAN_BIN_DIR}/sesman +@bindir@/sesman .br -${SESMAN_BIN_DIR}/sesrun +@bindir@/sesrun .SH "AUTHORS" Jay Sorg diff --git a/docs/man/xrdp.8.in b/docs/man/xrdp.8.in index 4ab795fa..d8025d01 100644 --- a/docs/man/xrdp.8.in +++ b/docs/man/xrdp.8.in @@ -24,13 +24,13 @@ Kills running \fBxrdp\fR daemon. Output help information and exit. .SH "FILES" -${XRDP_BIN_DIR}/xrdp +@bindir@/xrdp .br -${XRDP_CFG_DIR}/xrdp.ini +@sysconfdir@/xrdp/xrdp.ini .br -${XRDP_LOG_DIR}/xrdp.log +@localstatedir@/log/xrdp.log .br -${XRDP_PID_DIR}/xrdp.pid +@localstatedir@/run/xrdp.pid .SH "AUTHORS" Jay Sorg diff --git a/docs/man/xrdp.ini.5.in b/docs/man/xrdp.ini.5.in index 779633ca..5a06c7f4 100644 --- a/docs/man/xrdp.ini.5.in +++ b/docs/man/xrdp.ini.5.in @@ -54,7 +54,7 @@ If set to \fB1\fR, \fBtrue\fR or \fByes\fR this option enables compression of bu .TP \fBkey_file\fP=\fI/path/to/private_key\fP Set location of TLS certificate and private key. They must be written in PEM format. -If not specified, defaults to \fB${XRDP_CFG_DIR}/cert.pem\fP, \fB${XRDP_CFG_DIR}/key.pem\fP. +If not specified, defaults to \fB@sysconfdir@/xrdp/cert.pem\fP, \fB@sysconfdir@/xrdp/key.pem\fP. This parameter is effective only if \fBsecurity_layer\fP is set to \fBtls\fP or \fBnegotiate\fP. @@ -206,8 +206,8 @@ The highest value is 255 (hex FF). The following parameters can be used in the \fB[Logging]\fR section: .TP -\fBLogFile\fR=\fI${SESMAN_LOG_DIR}/sesman.log\fR -This options contains the path to logfile. It can be either absolute or relative, and the default is \fI${SESMAN_LOG_DIR}/sesman.log\fR +\fBLogFile\fR=\fI@localstatedir@/log/sesman.log\fR +This options contains the path to logfile. It can be either absolute or relative.\fR .TP \fBLogLevel\fR=\fIlevel\fR @@ -320,7 +320,7 @@ port=\-1 .fi .SH "FILES" -${XRDP_CFG_DIR}/xrdp.ini +@sysconfdir@/xrdp/xrdp.ini .SH "SEE ALSO" .BR xrdp (8),