diff options
| author | Brian Cameron <bcameron@src.gnome.org> | 2003-05-30 10:21:12 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2003-05-30 10:21:12 +0000 |
| commit | 530afb88047e1c0bf70358a22bd5fb872654eaa1 (patch) | |
| tree | 47c9197b90b76a4a190e33e0a8fb6cfe70ee3f2f /config | |
| parent | 1ed6a0c00566b00aa8f887105f5c52022be40ee1 (diff) | |
| download | gdm-530afb88047e1c0bf70358a22bd5fb872654eaa1.tar.gz | |
Fri May 30 Brian Cameron <Brian.Cameron@Sun.COM>
* configure.in, config/Default.in, config/PreSession.in,
config/PostSession.in: Now Default, PreSession and PostSession
are built using .in files so that we can properly set the
PATH on Solaris.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Default.in (renamed from config/Default) | 2 | ||||
| -rwxr-xr-x | config/PostSession.in (renamed from config/PostSession) | 2 | ||||
| -rwxr-xr-x | config/PreSession.in (renamed from config/PreSession) | 2 | ||||
| -rw-r--r-- | config/gdm.conf.in | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/config/Default b/config/Default.in index 057f69cd..fec2e819 100644 --- a/config/Default +++ b/config/Default.in @@ -3,7 +3,7 @@ # Plus a lot of fun stuff added # -George -PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH +PATH=@X_PATH@:$PATH sysmodmap=/etc/X11/Xmodmap diff --git a/config/PostSession b/config/PostSession.in index c2937309..75e54ae7 100755 --- a/config/PostSession +++ b/config/PostSession.in @@ -1,6 +1,6 @@ #!/bin/sh -PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH +PATH=@X_PATH@:$PATH if command -v sessreg > /dev/null 2>&1; then sessreg -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l $DISPLAY $USER diff --git a/config/PreSession b/config/PreSession.in index 971bd3f2..c1af766a 100755 --- a/config/PreSession +++ b/config/PreSession.in @@ -6,7 +6,7 @@ # # Note that output goes into the .xsession-errors file for easy debugging # -PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH +PATH=@X_PATH@:$PATH if command -v xsetroot > /dev/null 2>&1; then xsetroot -cursor_name left_ptr -solid "#363047" diff --git a/config/gdm.conf.in b/config/gdm.conf.in index 269c4cbb..ceb31616 100644 --- a/config/gdm.conf.in +++ b/config/gdm.conf.in @@ -42,9 +42,9 @@ GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session # should leave this alone Chooser=@EXPANDED_BINDIR@/gdmchooser # Default path to set. The profile scripts will likely override this -DefaultPath=/bin:/usr/bin:/usr/bin/X11:@X_PATH@:/usr/local/bin:@EXPANDED_BINDIR@ +DefaultPath=/bin:/usr/bin:/usr/bin/X11:@X_SERVER_PATH@:/usr/local/bin:@EXPANDED_BINDIR@ # Default path for root. The profile scripts will likely override this -RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:@X_PATH@:/usr/local/bin:@EXPANDED_BINDIR@ +RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:@X_SERVER_PATH@:/usr/local/bin:@EXPANDED_BINDIR@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init # Greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to # get the new graphical greeter. @@ -102,7 +102,7 @@ StandardXServer=@X_SERVER@ # The maximum number of flexible X servers to run. FlexibleXServers=5 # the X nest command -Xnest=@X_PATH@/Xnest -name Xnest +Xnest=@X_SERVER_PATH@/Xnest -name Xnest # Automatic VT allocation. Right now only works on Linux. This way # we force X to use specific vts. turn VTAllocation to false if this # is causing problems. |