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
5 '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
6 '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
7 '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
8 - '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
9 - '-DDEF_AUTH_DIR="$(XDMDIR)"' \
10 - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
11 + '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
12 + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
13 + '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
15 ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
16 LinkConfDirectory(xdm,.,xdm,.)
19 SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
20 NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
21 -InstallProgram(chooser,$(XDMDIR))
22 +InstallProgram(chooser,$(BINDIR))
23 InstallAppDefaults(Chooser)
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
31 all:: Xservers.ws xdm-config Xservers Xresources
33 -#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
37 -#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian)
43 # define XdmPixmap XFree86.xpm
47 CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
48 -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU),NullParameter)
49 +#ifdef LinuxArchitecture
50 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
52 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
53 +#endif /* LinuxArchitecture */
54 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
56 LinkFile(Xservers,Xservers.$(SERVERSTYPE))
57 diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
58 --- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002
59 +++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 18:41:24 2002
65 -xlogin*greetColor: CadetBlue
70 xlogin*innerFramesWidth: 2
72 xlogin*background: grey
73 !xlogin*foreground: darkgreen
74 xlogin*greetColor: Blue3
76 +login*greetColor: CadetBlue