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.

Signed-off-by: Gaetan Nadon <[email protected]>
---
 Makefile.am |    2 +-
 server.cpp  |    2 +-
 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
-- 
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

Reply via email to