diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-22 17:30:25 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2011-01-28 11:45:48 -0500 |
commit | d0671dca361c5937ad915ef8c3b3f574354d74be (patch) | |
tree | 41b5dfbc65ef4b796f119648322c1902c95f7b9a | |
parent | d433f80d3abd5b6f1ae2b84faaddcd9c30c3bbde (diff) |
config: -DSERVERNAME not required in client.cc and server.cpp
The server name, rstartd, is hard coded in the makefile and
there are no configure options to change it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | client.cpp | 2 | ||||
-rw-r--r-- | 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 @@ -121,4 +121,4 @@ $verbose / xauth list $disp | sed 's/^/AUTH X11 /' echo "" -) | RSHCMD $host $name SERVERNAME +) | RSHCMD $host $name rstartd @@ -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 |