projects / packages / X11.git / blame
| Commit | Line | Data |
|---|---|---|
| 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 | |
| 78fbeb20 | 18 | @@ -42,7 +42,11 @@ |
| 37f44e2a | 19 | #endif |
| 20 | ||
| 78fbeb20 | 21 | CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter) |
| 37f44e2a | 22 | +#ifdef LinuxArchitecture |
| ffe9f93d | 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) |
| 37f44e2a | 24 | +#else |
| 78fbeb20 AM |
25 | CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter) |
| 26 | +#endif | |
| 37f44e2a | 27 | CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) |
| 78fbeb20 | 28 | CppFileTarget(Xsession,Xsession.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter) |
| 37f44e2a | 29 | |
| 37f44e2a | 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 | |
| 32 | @@ -41,9 +41,7 @@ | |
| 33 | XHASHendif | |
| 34 | #endif /* XPM */ | |
| 35 | XHASHifdef COLOR | |
| 36 | -#ifndef XPM | |
| 37 | -xlogin*greetColor: CadetBlue | |
| 38 | -#else | |
| 39 | +#ifdef XPM | |
| 40 | xlogin*borderWidth: 1 | |
| 41 | xlogin*frameWidth: 5 | |
| 42 | xlogin*innerFramesWidth: 2 | |
| 43 | @@ -52,6 +50,8 @@ | |
| 44 | xlogin*background: grey | |
| 45 | !xlogin*foreground: darkgreen | |
| 46 | xlogin*greetColor: Blue3 | |
| 47 | +#else | |
| 48 | +login*greetColor: CadetBlue | |
| 49 | #endif /* XPM */ | |
| 50 | xlogin*failColor: red | |
| 51 | *Foreground: black | |
| 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 | |
| 54 | @@ -289,9 +289,9 @@ | |
| 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"' | |
| 64 | ||
| 65 | ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) | |
| 66 | #ifdef LinkConfDirectory | |
| 67 | @@ -316,7 +316,7 @@ | |
| 68 | #if BuildChooser | |
| 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) | |
| 74 | #endif | |
| 75 | #if BuildBoth |