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="$(CHOOSERPATH)"' \
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.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
27 --- xc.org/programs/xdm/config/Xres.cpp 2003-11-23 23:32:35.000000000 +0100
28 +++ xc/programs/xdm/config/Xres.cpp 2003-11-23 23:33:41.000000000 +0100
34 -xlogin*greetColor: CadetBlue
39 xlogin*innerFramesWidth: 2
41 xlogin*background: grey
42 !xlogin*foreground: darkgreen
43 xlogin*greetColor: Blue3
45 +login*greetColor: CadetBlue
49 --- xc/programs/xdm/config/Imakefile.orig 2006-01-09 16:01:05.000000000 +0100
50 +++ xc/programs/xdm/config/Imakefile 2006-06-11 02:49:16.806881792 +0200
53 all:: Xservers.ws xdm-config Xservers Xresources
55 -#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
59 -#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian)
65 # define XdmPixmap XFree86.xpm
69 CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
70 -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
71 +#ifdef LinuxArchitecture
72 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
74 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
75 +#endif /* LinuxArchitecture */
76 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
78 LinkFile(Xservers,Xservers.$(SERVERSTYPE))