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),NullParameter)
22 -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
23 +#ifdef LinuxArchitecture
24 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
26 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
27 +#endif /* LinuxArchitecture */
28 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
30 LinkFile(Xservers,Xservers.$(SERVERSTYPE))
31 --- xc.orig/programs/xdm/config/Xres.cpp 2004-08-08 14:31:29.000000000 +0200
32 +++ xc/programs/xdm/config/Xres.cpp 2004-08-08 15:03:33.539780384 +0200
38 -xlogin*greetColor: CadetBlue
43 xlogin*innerFramesWidth: 2
45 xlogin*background: grey
46 !xlogin*foreground: darkgreen
47 xlogin*greetColor: Blue3
49 +login*greetColor: CadetBlue
53 --- xc.orig/programs/xdm/Imakefile 2004-08-08 14:22:57.000000000 +0200
54 +++ xc/programs/xdm/Imakefile 2004-08-08 15:03:33.517783728 +0200
56 '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
57 '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
58 '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
59 - '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
60 - '-DDEF_AUTH_DIR="$(XDMDIR)"' \
61 - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
62 + '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
63 + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
64 + '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
66 ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
67 #ifdef LinkConfDirectory
70 SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
71 NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
72 -InstallProgram(chooser,$(XDMDIR))
73 +InstallProgram(chooser,$(BINDIR))
74 InstallAppDefaults(Chooser)