| 37f44e2a |
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 |
| 3 | @@ -10,13 +10,7 @@ |
| 4 | |
| 5 | all:: Xservers.ws xdm-config Xservers Xresources |
| 6 | |
| 7 | -#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture)) |
| 8 | -DEFAULTVT=vt05 |
| 9 | -#endif |
| 10 | - |
| 11 | -#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian) |
| 12 | -DEFAULTVT=vt7 |
| 13 | -#endif |
| 14 | +DEFAULTVT=vt9 |
| 15 | |
| 16 | #ifndef XdmPixmap |
| 17 | # define XdmPixmap XVendorStdFilePrefix.xpm |
| 18 | @@ -42,7 +36,11 @@ |
| 19 | #endif |
| 20 | |
| 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) |
| 25 | +#else |
| 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) |
| 29 | |
| 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 |
| 33 | @@ -41,9 +41,7 @@ |
| 34 | XHASHendif |
| 35 | #endif /* XPM */ |
| 36 | XHASHifdef COLOR |
| 37 | -#ifndef XPM |
| 38 | -xlogin*greetColor: CadetBlue |
| 39 | -#else |
| 40 | +#ifdef XPM |
| 41 | xlogin*borderWidth: 1 |
| 42 | xlogin*frameWidth: 5 |
| 43 | xlogin*innerFramesWidth: 2 |
| 44 | @@ -52,6 +50,8 @@ |
| 45 | xlogin*background: grey |
| 46 | !xlogin*foreground: darkgreen |
| 47 | xlogin*greetColor: Blue3 |
| 48 | +#else |
| 49 | +login*greetColor: CadetBlue |
| 50 | #endif /* XPM */ |
| 51 | xlogin*failColor: red |
| 52 | *Foreground: black |
| 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 |
| 55 | @@ -289,9 +289,9 @@ |
| 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"' |
| 65 | |
| 66 | ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) |
| 67 | #ifdef LinkConfDirectory |
| 68 | @@ -316,7 +316,7 @@ |
| 69 | #if BuildChooser |
| 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) |
| 75 | #endif |
| 76 | #if BuildBoth |
projects / packages / X11.git / blame