1 --- xc.orig/programs/xdm/config/Imakefile 2004-08-08 14:22:57.000000000 +0200
2 +++ xc/programs/xdm/config/Imakefile 2004-08-08 15:04:29.403287840 +0200
5 all:: Xservers.ws xdm-config Xservers Xresources
7 -#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
11 -#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian)
17 # define XdmPixmap XVendorStdFilePrefix.xpm
21 CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
22 +#ifdef LinuxArchitecture
23 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
25 CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter)
27 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
28 CppFileTarget(Xsession,Xsession.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
30 --- xc.orig/programs/xdm/config/Xres.cpp 2004-08-08 14:31:29.000000000 +0200
31 +++ xc/programs/xdm/config/Xres.cpp 2004-08-08 15:03:33.539780384 +0200
37 -xlogin*greetColor: CadetBlue
42 xlogin*innerFramesWidth: 2
44 xlogin*background: grey
45 !xlogin*foreground: darkgreen
46 xlogin*greetColor: Blue3
48 +login*greetColor: CadetBlue
52 --- xc.orig/programs/xdm/Imakefile 2004-08-08 14:22:57.000000000 +0200
53 +++ xc/programs/xdm/Imakefile 2004-08-08 15:03:33.517783728 +0200
55 '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
56 '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
57 '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
58 - '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
59 - '-DDEF_AUTH_DIR="$(XDMDIR)"' \
60 - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
61 + '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
62 + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
63 + '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
65 ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
66 #ifdef LinkConfDirectory
69 SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
70 NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
71 -InstallProgram(chooser,$(XDMDIR))
72 +InstallProgram(chooser,$(BINDIR))
73 InstallAppDefaults(Chooser)