The server name, rstartd, is hard coded in the makefile and there are no configure options to change it.
Signed-off-by: Gaetan Nadon <[email protected]> --- Makefile.am | 4 ++-- client.cpp | 2 +- server.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index f620432..edbae12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,11 +65,11 @@ bin_SCRIPTS = rstart rstartd rstart: client.cpp $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) -DRSHCMD=$(RSH) \ - -DSERVERNAME=rstartd < ${srcdir}/client.cpp | $(CPP_SED_MAGIC) > $@ + < ${srcdir}/client.cpp | $(CPP_SED_MAGIC) > $@ rstartd: server.cpp $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) -DBINDIR=$(rstartdir) \ - -DLIBDIR=$(rstartdir) -DSERVERNAME=rstartd < ${srcdir}/server.cpp | \ + -DLIBDIR=$(rstartdir) < ${srcdir}/server.cpp | \ $(CPP_SED_MAGIC) > $@ EXTRA_DIST = client.cpp server.cpp config.cpp diff --git a/client.cpp b/client.cpp index 8c5f58e..8418d25 100644 --- a/client.cpp +++ b/client.cpp @@ -121,4 +121,4 @@ $verbose / xauth list $disp | sed 's/^/AUTH X11 /' echo "" -) | RSHCMD $host $name SERVERNAME +) | RSHCMD $host $name rstartd diff --git a/server.cpp b/server.cpp index 3501b40..44a0e15 100644 --- a/server.cpp +++ b/server.cpp @@ -26,4 +26,4 @@ XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. XCOMM XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.2 2001/01/17 23:45:03 dawes Exp $ -exec BINDIR/SERVERNAME.real -c LIBDIR/config +exec BINDIR/rstartd.real -c LIBDIR/config -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
