[Xorg-commit] xc/programs/rstart Imakefile,1.1.4.2,1.1.4.3 server.cpp,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/rstart
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/rstart

Modified Files:
      Tag: XORG-CURRENT
	Imakefile server.cpp 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/rstart/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	26 Nov 2003 22:49:10 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:37:34 -0000	1.1.4.3
@@ -3,7 +3,7 @@
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.12 2003/05/23 14:54:01 tsi Exp $
+XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.13 2004/01/09 00:28:50 dawes Exp $
 XCOMM
 XCOMM Copyright (c) 1993 Quarterdeck Office Systems
 XCOMM
@@ -72,7 +72,7 @@
 SpecialCObjectRule(server,NullParameter,$(SRVDEFS) $(PEDEFS))
 
 AllTarget($(SSERVERNAME))
-CppScriptTarget($(SSERVERNAME),$(SSERVERSRC),$(OS) -DLIBDIR=$(MYLIBDIR) -DSERVERNAME=$(SERVERNAME),NullParameter)
+CppScriptTarget($(SSERVERNAME),$(SSERVERSRC),$(OS) -DLIBDIR=$(MYLIBDIR) -DSERVERNAME=$(SERVERNAME) -DBINDIR=$(MYLIBDIR),NullParameter)
 InstallNamedProg($(SSERVERNAME),$(SSERVERNAME),$(BINDIR))
 
 AllTarget($(CLIENTNAME))

Index: server.cpp
===================================================================
RCS file: /cvs/xorg/xc/programs/rstart/server.cpp,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/server.cpp	17 Nov 2003 19:03:47 -0000	1.1.4.1
+++ b/server.cpp	23 Feb 2004 21:37:34 -0000	1.1.4.2
@@ -24,6 +24,6 @@
 XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT
 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 $
+XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.3 2004/01/09 00:28:50 dawes Exp $
 
-exec LIBDIR/SERVERNAME.real -c LIBDIR/config
+exec BINDIR/SERVERNAME.real -c LIBDIR/config