summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@freedesktop.org>2012-11-30 06:56:34 -0500
committerEgbert Eich <eich@freedesktop.org>2013-01-04 05:42:39 -0500
commit2b712991f56eb4257ec4f761d055a8ca9c156463 (patch)
treea7117dab16a535fbb196a67efcb8c40309580f4c
parent261f9ddab794742c07e28c93f8d5bbbf992676bd (diff)
man: Set correct config file location in man page
Change the config file location from a hard coded path to what is set during build. Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--man/Makefile.am1
-rw-r--r--man/rstartd.man2
2 files changed, 2 insertions, 1 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index 08a563c..378a4c2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,5 +8,6 @@ CLEANFILES = $(appman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__configdir__|$(configdir)|g'
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/rstartd.man b/man/rstartd.man
index ffd9e15..df0b5aa 100644
--- a/man/rstartd.man
+++ b/man/rstartd.man
@@ -59,7 +59,7 @@ is to read. Normally, \fIrstartd\fP is a shell script that invokes
\fIrstartd.real\fP with the \fB-c\fP switch, allowing local configuration
of the location of the configuration file. If \fIrstartd.real\fP is started
without the -c option, it reads
-.IR __projectroot__/lib/X11/rstart/config .
+.IR __configdir__/config .
.SH INSTALLATION
It is critical to successful interoperation of the Remote Start protocol
that \fIrstartd\fP be installed in a directory which is in the "default"