]>
Commit | Line | Data |
---|---|---|
159289d8 | 1 | diff -urN xc.orig/programs/xdm/Imakefile xc/programs/xdm/Imakefile |
2 | --- xc.orig/programs/xdm/Imakefile Mon Dec 30 15:54:06 2002 | |
3 | +++ xc/programs/xdm/Imakefile Mon Dec 30 18:33:35 2002 | |
4 | @@ -256,9 +256,9 @@ | |
e23f9969 JR |
5 | '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ |
6 | '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ | |
7 | '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ | |
edff1c06 | 8 | - '-DDEF_CHOOSER="$(CHOOSERPATH)"' \ |
e23f9969 JR |
9 | - '-DDEF_AUTH_DIR="$(XDMDIR)"' \ |
10 | - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"' | |
9ef8ee7a | 11 | + '-DDEF_CHOOSER="$(BINDIR)/chooser"' \ |
e23f9969 JR |
12 | + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ |
13 | + '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"' | |
e23f9969 JR |
14 | |
15 | ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) | |
159289d8 | 16 | LinkConfDirectory(xdm,.,xdm,.) |
17 | @@ -277,7 +277,7 @@ | |
e23f9969 JR |
18 | #if BuildChooser |
19 | SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES)) | |
20 | NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) | |
21 | -InstallProgram(chooser,$(XDMDIR)) | |
22 | +InstallProgram(chooser,$(BINDIR)) | |
23 | InstallAppDefaults(Chooser) | |
24 | #endif | |
25 | #if BuildBoth | |
159289d8 | 26 | diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile |
27 | --- xc.orig/programs/xdm/config/Imakefile Mon Dec 30 15:54:07 2002 | |
28 | +++ xc/programs/xdm/config/Imakefile Mon Dec 30 18:38:58 2002 | |
29 | @@ -9,13 +9,7 @@ | |
1d5726dc JR |
30 | |
31 | all:: Xservers.ws xdm-config Xservers Xresources | |
32 | ||
6a975830 | 33 | -#if defined(i386Architecture) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture)) |
1d5726dc JR |
34 | -DEFAULTVT=vt05 |
35 | -#endif | |
159289d8 | 36 | - |
37 | -#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian) | |
38 | -DEFAULTVT=vt7 | |
39 | -#endif | |
1d5726dc JR |
40 | +DEFAULTVT=vt9 |
41 | ||
42 | #ifndef XdmPixmap | |
43 | # define XdmPixmap XFree86.xpm | |
159289d8 | 44 | @@ -39,7 +33,11 @@ |
e23f9969 JR |
45 | #endif |
46 | ||
47 | CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter) | |
edff1c06 | 48 | -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) |
e23f9969 | 49 | +#ifdef LinuxArchitecture |
edff1c06 | 50 | +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) |
e23f9969 | 51 | +#else |
edff1c06 | 52 | +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) |
e23f9969 JR |
53 | +#endif /* LinuxArchitecture */ |
54 | CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) | |
55 | ||
56 | LinkFile(Xservers,Xservers.$(SERVERSTYPE)) | |
4f5b637e AM |
57 | diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp |
58 | --- xc.org/programs/xdm/config/Xres.cpp 2003-11-23 23:32:35.000000000 +0100 | |
59 | +++ xc/programs/xdm/config/Xres.cpp 2003-11-23 23:33:41.000000000 +0100 | |
159289d8 | 60 | @@ -41,9 +41,7 @@ |
4f5b637e | 61 | XHASHendif |
e23f9969 | 62 | #endif /* XPM */ |
4f5b637e | 63 | XHASHifdef COLOR |
e23f9969 JR |
64 | -#ifndef XPM |
65 | -xlogin*greetColor: CadetBlue | |
66 | -#else | |
67 | +#ifdef XPM | |
68 | xlogin*borderWidth: 1 | |
69 | xlogin*frameWidth: 5 | |
70 | xlogin*innerFramesWidth: 2 | |
159289d8 | 71 | @@ -52,6 +50,8 @@ |
e23f9969 JR |
72 | xlogin*background: grey |
73 | !xlogin*foreground: darkgreen | |
74 | xlogin*greetColor: Blue3 | |
75 | +#else | |
1d5726dc | 76 | +login*greetColor: CadetBlue |
e23f9969 JR |
77 | #endif /* XPM */ |
78 | xlogin*failColor: red | |
79 | *Foreground: black |