bindir.patch revision 1199
792N/A###############################################################################
792N/A#
943N/A# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
792N/A#
792N/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
919N/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
919N/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
919N/A# DEALINGS IN THE SOFTWARE.
792N/A#
792N/A###############################################################################
792N/A
851N/ASet paths used in config files for finding X utilities to look in /usr/bin
851N/Aeven though --bindir is set to /usr/sbin
792N/A
1199N/Adiff --git a/config/Makefile.am b/config/Makefile.am
1199N/Aindex d13645f..4393667 100644
1199N/A--- a/config/Makefile.am
1199N/A+++ b/config/Makefile.am
1199N/A@@ -49,7 +49,7 @@ XPMDEFINES = -DXPM -DBITMAPDIR=$(XDM_PIXMAPDIR) -DXDM_PIXMAP=$(XDM_PIXMAP) \
792N/A MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
792N/A #endif
792N/A
792N/A-CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
851N/A+CPP_FILES_FLAGS = -DBINDIR="/usr/bin" -DDEFAULTVT="$(DEFAULTVT)" \
792N/A -DUTMP_FILE="$(UTMP_FILE)" -DWTMP_FILE="$(WTMP_FILE)" \
792N/A -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
792N/A -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
1199N/Adiff --git a/configure.ac b/configure.ac
1199N/Aindex b123a1f..4ebc4f5 100644
1199N/A--- a/configure.ac
1199N/A+++ b/configure.ac
1199N/A@@ -547,7 +547,7 @@ AC_DEFINE_DIR(DEF_SYSTEM_SHELL, BOURNE_SHELL,
1199N/A
1199N/A # -DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"
1199N/A
1199N/A-AC_DEFINE_DIR(DEF_FAILSAFE_CLIENT, bindir/xterm,
1199N/A+AC_DEFINE_DIR(DEF_FAILSAFE_CLIENT, /usr/bin/xterm,
1199N/A [Define to default command to start failsafe X session])
1199N/A
1199N/A # -DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"
1199N/Adiff --git a/xdm.man.cpp b/xdm.man.cpp
1199N/Aindex b947e5a..1a25fa8 100644
1199N/A--- a/xdm.man.cpp
1199N/A+++ b/xdm.man.cpp
1199N/A@@ -413,7 +413,7 @@ See the sections \fBXDMCP Access Control\fP and \fBChooser\fP.
792N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.xrdb\fP"
792N/A Specifies the program used to load the resources. By default,
792N/A .I xdm
792N/A-uses \fI BINDIR/xrdb\fP.
851N/A+uses \fI /usr/bin/xrdb\fP.
792N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.cpp\fP"
792N/A This specifies the name of the C preprocessor which is used by \fIxrdb\fP.
792N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.setup\fP"
792N/A@@ -431,7 +431,7 @@ file used here is \fIXstartup\fP.
792N/A See the section \fBStartup Program.\fP
792N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.session\fP"
792N/A This specifies the session to be executed (not running as root).
792N/A-By default, \fI BINDIR/xterm\fP is
851N/A+By default, \fI /usr/bin/xterm\fP is
792N/A run. The conventional name is \fIXsession\fP.
792N/A See the section
792N/A .B "Session Program."
792N/A@@ -512,7 +512,7 @@ If the default session fails to execute,
792N/A will fall back to this program. This program is executed with no
792N/A arguments, but executes using the same environment variables as
792N/A the session would have had (see the section \fBSession Program\fP).
792N/A-By default, \fI BINDIR/xterm\fP is used.
851N/A+By default, \fI /usr/bin/xterm\fP is used.
792N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabServer\fP"
792N/A .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.grabTimeout\fP"
792N/A To improve security,
1199N/A@@ -816,7 +816,7 @@ line to start the server. A typical entry for local display number 0 would
792N/A be:
792N/A .nf
792N/A
792N/A- :0 Digital-QV local BINDIR/X :0
851N/A+ :0 Digital-QV local /usr/bin/X :0
792N/A
792N/A .fi
792N/A The display types are:
1199N/A@@ -831,8 +831,8 @@ foreign remote display: \fIxdm\fP opens an X connection to a running server
792N/A The display name must be something that can be passed in the \fB\-display\fP
792N/A option to an X program. This string is used to generate the display-specific
792N/A resource names, so be careful to match the
792N/A-names (e.g., use ``:0 Sun-CG3 local BINDIR/X :0'' instead of
792N/A-``localhost:0 Sun-CG3 local BINDIR/X :0''
851N/A+names (e.g., use ``:0 Sun-CG3 local /usr/bin/X :0'' instead of
851N/A+``localhost:0 Sun-CG3 local /usr/bin/X :0''
792N/A if your other resources are specified as
792N/A ``DisplayManager._0.session''). The display class portion is also used in the
792N/A display-specific resources, as the class of the resource. This is
792N/A@@ -1374,7 +1374,7 @@ line:
792N/A .nf
792N/A .ta .5i
792N/A
792N/A- xdm \-server \(lq:0 SUN-3/60CG4 local BINDIR/X :0\(rq
851N/A+ xdm \-server \(lq:0 SUN-3/60CG4 local /usr/bin/X :0\(rq
792N/A
792N/A .fi
792N/A .PP
1199N/A@@ -1414,13 +1414,13 @@ user authorization file where \fIxdm\fP stores keys for clients to read
792N/A .I CHOOSERPATH
792N/A the default chooser
792N/A .TP 20
792N/A-.I BINDIR/xrdb
851N/A+.I /usr/bin/xrdb
792N/A the default resource database loader
792N/A .TP 20
792N/A-.I BINDIR/X
851N/A+.I /usr/bin/X
792N/A the default server
792N/A .TP 20
792N/A-.I BINDIR/xterm
851N/A+.I /usr/bin/xterm
792N/A the default session program and failsafe client
792N/A .TP 20
792N/A .I XDMXAUTHDIR/A<display>\-<suffix>