[PATCH rstart] man: Set correct config file location in man page

Egbert Eich eich at freedesktop.org
Thu Jan 3 10:44:55 PST 2013

Change the config file location from a hard coded path to what is
set during build.

Signed-off-by: Egbert Eich <eich at freedesktop.org>
 man/Makefile.am |    1 +
 man/rstartd.man |    2 +-
 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)
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__configdir__|$(configdir)|g'
 	$(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 .
 It is critical to successful interoperation of the Remote Start protocol
 that \fIrstartd\fP be installed in a directory which is in the "default"

More information about the xorg-devel mailing list