diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-26 03:21:17 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-10-26 03:21:17 +0000 |
| commit | 461b7fc37aae3578577a9eab2c9310287af14726 (patch) | |
| tree | 77ba194ec921276dc96f9e85ed283ebb02e7fb20 | |
| parent | 16917371d7663d59c58dbd27c8592d3b6e8ef078 (diff) | |
Use XDMCONFIGDIR for location of configuration files so they can be
installed in a directory other than the lib directory. (Only
overridable in modular build system at this point.)
| -rw-r--r-- | config/xdm-config.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp index 5b5ac79..1011cb1 100644 --- a/config/xdm-config.cpp +++ b/config/xdm-config.cpp @@ -1,15 +1,20 @@ ! $Xorg: xdm-conf.cpp,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +! $XdotOrg: $ ! ! ! ! ! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.10 2002/11/30 19:11:32 herrb Exp $ ! +#ifndef XDMCONFIGDIR +#define XDMCONFIGDIR XDMDIR +#endif DisplayManager.errorLogFile: XDMLOGDIR/xdm.log DisplayManager.pidFile: XDMPIDDIR/xdm.pid -DisplayManager.keyFile: XDMDIR/xdm-keys -DisplayManager.servers: XDMDIR/Xservers -DisplayManager.accessFile: XDMDIR/Xaccess +DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys +DisplayManager.servers: XDMCONFIGDIR/Xservers +DisplayManager.accessFile: XDMCONFIGDIR/Xaccess +DisplayManager*resources: XDMCONFIGDIR/Xresources DisplayManager.willing: SU nobody -c XDMDIR/Xwilling ! All displays should use authorization, but we cannot be sure ! X terminals may not be configured that way, so they will require @@ -17,7 +22,6 @@ DisplayManager.willing: SU nobody -c XDMDIR/Xwilling DisplayManager*authorize: true ! DisplayManager*chooser: CHOOSERPATH -DisplayManager*resources: XDMDIR/Xresources DisplayManager*startup: XDMDIR/Xstartup DisplayManager*session: XDMDIR/Xsession DisplayManager*reset: XDMDIR/Xreset |