summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-01-22 17:36:24 -0500
committerGaetan Nadon <memsize@videotron.ca>2011-01-28 11:45:49 -0500
commit4ddce1b4a83514a6a6555aa65a8b66f80e5fc9dc (patch)
tree2dc0236e7f162650fae935032de9cb65d0560c33
parentd0671dca361c5937ad915ef8c3b3f574354d74be (diff)
config: -DBINDIR not required in server.cpp
The value of BINDIR and LIBDIR are always identical. There are no configure option to change it. These are not bindir and libdir from automake, the value is always $libdir/X11/rstart. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--Makefile.am2
-rw-r--r--server.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index edbae12..c867280 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@ rstart: client.cpp
< ${srcdir}/client.cpp | $(CPP_SED_MAGIC) > $@
rstartd: server.cpp
- $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) -DBINDIR=$(rstartdir) \
+ $(AM_V_GEN) $(RAWCPP) $(RAWCPPFLAGS) \
-DLIBDIR=$(rstartdir) < ${srcdir}/server.cpp | \
$(CPP_SED_MAGIC) > $@
diff --git a/server.cpp b/server.cpp
index 44a0e15..dcb7bd2 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/rstartd.real -c LIBDIR/config
+exec LIBDIR/rstartd.real -c LIBDIR/config