bindir.patch revision 943
258N/A###############################################################################
919N/A#
258N/A# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
258N/A#
919N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
258N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
258N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
258N/A# DEALINGS IN THE SOFTWARE.
258N/A#
258N/A###############################################################################
258N/A
258N/ASet paths used in config files for finding X utilities to look in /usr/bin
258N/Aeven though --bindir is set to /usr/sbin
258N/A
258N/Adiff -urp -x '*~' -x '*.orig' config/Makefile.am config/Makefile.am
258N/A--- config/Makefile.am 2009-09-17 19:24:37.000000000 -0700
258N/A+++ config/Makefile.am 2009-09-24 15:02:04.421431000 -0700
258N/A@@ -49,7 +49,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
258N/A MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
258N/A #endif
258N/A
258N/A-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
258N/A+CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
258N/A -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
258N/A -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
258N/A -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
258N/Adiff -urp -x '*~' -x '*.orig' config/Makefile.in config/Makefile.in
258N/A--- config/Makefile.in 2009-09-18 15:32:28.000000000 -0700
258N/A+++ config/Makefile.in 2009-09-24 15:02:04.431540000 -0700
258N/A@@ -340,7 +340,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIX
258N/A #if HAVE_MKTEMP_COMMAND
258N/A MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
258N/A #endif
258N/A-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
258N/A+CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
258N/A -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
258N/A -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
258N/A -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
258N/Adiff -urp -x '*~' -x '*.orig' xdm.man.cpp xdm.man.cpp
258N/A--- xdm.man.cpp 2009-09-17 19:24:37.000000000 -0700
258N/A+++ xdm.man.cpp 2009-09-24 15:02:04.446548000 -0700
258N/A@@ -413,7 +413,7 @@ See the sections \fBXDMCP Access Control
258N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.xrdb\fP"
258N/A Specifies the program used to load the resources. By default,
258N/A .I xdm
258N/A-uses \fI BINDIR/xrdb\fP.
258N/A+uses \fI /usr/bin/xrdb\fP.
258N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.cpp\fP"
258N/A This specifies the name of the C preprocessor which is used by \fIxrdb\fP.
258N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
258N/A@@ -431,7 +431,7 @@ file used here is \fIXstartup\fP.
258N/A See the section \fBStartup Program.\fP
258N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
258N/A This specifies the session to be executed (not running as root).
258N/A-By default, \fI BINDIR/xterm\fP is
258N/A+By default, \fI /usr/bin/xterm\fP is
258N/A run. The conventional name is \fIXsession\fP.
258N/A See the section
258N/A .B "Session Program."
258N/A@@ -512,7 +512,7 @@ If the default session fails to execute,
258N/A will fall back to this program. This program is executed with no
258N/A arguments, but executes using the same environment variables as
258N/A the session would have had (see the section \fBSession Program\fP).
258N/A-By default, \fI BINDIR/xterm\fP is used.
258N/A+By default, \fI /usr/bin/xterm\fP is used.
258N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
258N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
258N/A To improve security,
258N/A@@ -816,7 +816,7 @@ line to start the server. A typical ent
258N/A be:
258N/A .nf
258N/A
258N/A- :0 Digital-QV local BINDIR/X :0
258N/A+ :0 Digital-QV local /usr/bin/X :0
258N/A
258N/A .fi
258N/A The display types are:
258N/A@@ -831,8 +831,8 @@ foreign remote display: \fIxdm\fP opens
258N/A The display name must be something that can be passed in the \fB\-display\fP
258N/A option to an X program. This string is used to generate the display-specific
258N/A resource names, so be careful to match the
258N/A-names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
258N/A-``localhost:0 Sun-CG3 local BINDIR/X :0''
258N/A+names (e.g., use ``:0 Sun-CG3 local /usr/bin/X :0'' instead of
258N/A+``localhost:0 Sun-CG3 local /usr/bin/X :0''
258N/A if your other resources are specified as
258N/A ``DisplayManager._0.session''). The display class portion is also used in the
258N/A display-specific resources, as the class of the resource. This is
258N/A@@ -1374,7 +1374,7 @@ line:
258N/A .nf
258N/A .ta .5i
258N/A
258N/A- xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
258N/A+ xdm \-server \(lq:0 SUN-3/60CG4 local /usr/bin/X :0\(rq
258N/A
258N/A .fi
258N/A .PP
258N/A@@ -1414,13 +1414,13 @@ user authorization file where \fIxdm\fP
258N/A .I CHOOSERPATH
258N/A the default chooser
258N/A .TP 20
258N/A-.I BINDIR/xrdb
258N/A+.I /usr/bin/xrdb
258N/A the default resource database loader
258N/A .TP 20
258N/A-.I BINDIR/X
258N/A+.I /usr/bin/X
258N/A the default server
258N/A .TP 20
258N/A-.I BINDIR/xterm
258N/A+.I /usr/bin/xterm
258N/A the default session program and failsafe client
258N/A .TP 20
258N/A .I XDMXAUTHDIR/A<display>\-<suffix>
258N/A