diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-12-11 20:46:25 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-12-11 20:46:25 +0000 |
| commit | c8288d472e3c0881a201207140ac51ce713da877 (patch) | |
| tree | 6d10eb1cb80f8583d21333ca2e7bd640615f3c13 | |
| parent | 3d1caeec0b120997b5a958bec586c01665516499 (diff) | |
Bugzilla #5055 <https://bugs.freedesktop.org/show_bug.cgi?id=5055> AddMODULAR_COPY
XDMSCRIPTDIR cpp substitution to allow modular tree builder/packager to
decide if scripts should go in config, lib, or data directories.
| -rw-r--r-- | config/xdm-config.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp index 1011cb1..cdf8294 100644 --- a/config/xdm-config.cpp +++ b/config/xdm-config.cpp @@ -9,27 +9,30 @@ #ifndef XDMCONFIGDIR #define XDMCONFIGDIR XDMDIR #endif +#ifndef XDMSCRIPTDIR +#define XDMSCRIPTDIR XDMDIR +#endif DisplayManager.errorLogFile: XDMLOGDIR/xdm.log DisplayManager.pidFile: XDMPIDDIR/xdm.pid DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys DisplayManager.servers: XDMCONFIGDIR/Xservers DisplayManager.accessFile: XDMCONFIGDIR/Xaccess DisplayManager*resources: XDMCONFIGDIR/Xresources -DisplayManager.willing: SU nobody -c XDMDIR/Xwilling +DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling ! All displays should use authorization, but we cannot be sure ! X terminals may not be configured that way, so they will require ! individual resource settings. DisplayManager*authorize: true ! DisplayManager*chooser: CHOOSERPATH -DisplayManager*startup: XDMDIR/Xstartup -DisplayManager*session: XDMDIR/Xsession -DisplayManager*reset: XDMDIR/Xreset +DisplayManager*startup: XDMSCRIPTDIR/Xstartup +DisplayManager*session: XDMSCRIPTDIR/Xsession +DisplayManager*reset: XDMSCRIPTDIR/Xreset DisplayManager*authComplain: true ! The following three resources set up display :0 as the console. -DisplayManager._0.setup: XDMDIR/Xsetup_0 -DisplayManager._0.startup: XDMDIR/GiveConsole -DisplayManager._0.reset: XDMDIR/TakeConsole +DisplayManager._0.setup: XDMSCRIPTDIR/Xsetup_0 +DisplayManager._0.startup: XDMSCRIPTDIR/GiveConsole +DisplayManager._0.reset: XDMSCRIPTDIR/TakeConsole #ifdef XPM DisplayManager*loginmoveInterval: 10 #endif /* XPM */ |