On 01/ 3/13 10:44 AM, Egbert Eich wrote: > Change the config file location from a hard coded path to what is > set during build. > > Signed-off-by: Egbert Eich <e...@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) > 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"
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel