Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide custom version of rstartd.cpp that supports a BINDIR

Browse Source 
(for rstartd.real) separate to the LIBDIR (for the configuration)
and install rstartd.real into /usr/X11R6/libexec.
(Installing binaries under /usr/X11R6/lib/X11 (which may be a
symlink to /etc/X11) is Bad.0

Override BINDIR after the .include of <bsd.own.mk>, so that rstartd.real
is installed in the correct location.
This commit is contained in:
lukem 2004-01-02 16:32:12 +00:00
parent bce7c4948b
commit 4c6d23c4a8
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/bin/rstart/Makefile
View File

@ -1,24 +1,24 @@
# $NetBSD: Makefile,v 1.3 2003/09/20 06:20:48 lukem Exp $
# $NetBSD: Makefile,v 1.4 2004/01/02 16:32:12 lukem Exp $
.include <bsd.own.mk>
PROG= rstartd.real
SRCS= auth.c server.c
BINDIR= ${X11LIBDIR}/rstart
RSTARTDBINDIR= ${X11ROOTDIR}/libexec
CPPFLAGS.server.c= -DSERVERNAME=\"rstartd\" \
-DDEFAULT_CONFIG=\"${X11LIBDIR}/rstart/config\"
MAN= rstart.1 rstartd.1
BUILDSYMLINKS= client.cpp rstart.cpp \
server.cpp rstartd.cpp
BUILDSYMLINKS= client.cpp rstart.cpp
CPPSCRIPTS= config rstart rstartd
CPPSCRIPTFLAGS_config= -DBINDIR=${X11BINDIR} -DLIBDIR=${X11LIBDIR}/rstart \
-DPACKAGEname=rstart -DENVPREFIX=RSTART
CPPSCRIPTFLAGS_rstart= -DRSHCMD=rsh -DSERVERNAME=rstartd
CPPSCRIPTFLAGS_rstartd= -DLIBDIR=${X11LIBDIR}/rstart -DSERVERNAME=rstartd
CPPSCRIPTFLAGS_rstartd= -DLIBDIR=${X11LIBDIR}/rstart -DSERVERNAME=rstartd \
-DBINDIR=${RSTARTDBINDIR}
SCRIPTS= rstart rstartd
SCRIPTSDIR= ${X11BINDIR}
FILES= config
@ -29,5 +29,6 @@ SUBDIR= commands contexts
.PATH: ${X11SRCDIR.xc}/programs/rstart
.include <bsd.x11.mk>
BINDIR= ${RSTARTDBINDIR}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>

29
x11/bin/rstart/rstartd.cpp Normal file
View File

@ -0,0 +1,29 @@
XCOMM! /bin/sh
XCOMM $Xorg: server.cpp,v 1.3 2000/08/17 19:54:01 cpqbld Exp $
XCOMM
XCOMM Copyright (c) 1993 Quarterdeck Office Systems
XCOMM
XCOMM Permission to use, copy, modify, distribute, and sell this software
XCOMM and software and its documentation for any purpose is hereby granted
XCOMM without fee, provided that the above copyright notice appear in all
XCOMM copies and that both that copyright notice and this permission
XCOMM notice appear in supporting documentation, and that the name
XCOMM Quarterdeck Office Systems, Inc. not be used in advertising or
XCOMM publicity pertaining to distribution of this software without
XCOMM specific, written prior permission.
XCOMM
XCOMM THIS SOFTWARE IS PROVIDED "AS-IS". QUARTERDECK OFFICE SYSTEMS,
XCOMM INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
XCOMM INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF
XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
XCOMM NONINFRINGEMENT. IN NO EVENT SHALL QUARTERDECK OFFICE SYSTEMS,
XCOMM INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL,
XCOMM INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR
XCOMM PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS
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 $
exec BINDIR/SERVERNAME.real -c LIBDIR/config