projects / packages / X11.git / blame
| Commit | Line | Data |
|---|---|---|
| 1d5726dc JR |
1 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/Imakefile XFree86-4.0.2/xc/programs/xdm/Imakefile |
| 2 | --- XFree86-4.0.2.org/xc/programs/xdm/Imakefile Wed Nov 29 17:46:07 2000 | |
| 3 | +++ XFree86-4.0.2/xc/programs/xdm/Imakefile Thu Dec 21 13:10:37 2000 | |
| 4 | @@ -225,9 +225,9 @@ | |
| e23f9969 JR |
5 | '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ |
| 6 | '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ | |
| 7 | '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ | |
| 8 | - '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \ | |
| 9 | - '-DDEF_AUTH_DIR="$(XDMDIR)"' \ | |
| 10 | - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"' | |
| 9ef8ee7a | 11 | + '-DDEF_CHOOSER="$(BINDIR)/chooser"' \ |
| e23f9969 JR |
12 | + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ |
| 13 | + '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"' | |
| 14 | #endif | |
| 15 | ||
| 16 | ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) | |
| 1d5726dc | 17 | @@ -247,7 +247,7 @@ |
| e23f9969 JR |
18 | #if BuildChooser |
| 19 | SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES)) | |
| 20 | NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) | |
| 21 | -InstallProgram(chooser,$(XDMDIR)) | |
| 22 | +InstallProgram(chooser,$(BINDIR)) | |
| 23 | InstallAppDefaults(Chooser) | |
| 24 | #endif | |
| 25 | #if BuildBoth | |
| 1d5726dc JR |
26 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile XFree86-4.0.2/xc/programs/xdm/config/Imakefile |
| 27 | --- XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile Mon Jan 31 20:33:43 2000 | |
| 28 | +++ XFree86-4.0.2/xc/programs/xdm/config/Imakefile Thu Dec 21 13:20:54 2000 | |
| 29 | @@ -5,9 +5,7 @@ | |
| 30 | ||
| 31 | all:: Xservers.ws xdm-config Xservers Xresources | |
| 32 | ||
| 33 | -#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)) | |
| 34 | -DEFAULTVT=vt05 | |
| 35 | -#endif | |
| 36 | +DEFAULTVT=vt9 | |
| 37 | ||
| 38 | #ifndef XdmPixmap | |
| 39 | # define XdmPixmap XFree86.xpm | |
| 40 | @@ -25,7 +23,11 @@ | |
| e23f9969 JR |
41 | #endif |
| 42 | ||
| 43 | CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter) | |
| 44 | -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter) | |
| 45 | +#ifdef LinuxArchitecture | |
| 46 | +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter) | |
| 47 | +#else | |
| 48 | +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter) | |
| 49 | +#endif /* LinuxArchitecture */ | |
| 50 | CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) | |
| 51 | ||
| 52 | LinkFile(Xservers,Xservers.$(SERVERSTYPE)) | |
| 1d5726dc JR |
53 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp |
| 54 | --- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Thu Dec 21 13:06:17 2000 | |
| 55 | +++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Thu Dec 21 13:19:25 2000 | |
| 56 | @@ -36,9 +36,7 @@ | |
| e23f9969 JR |
57 | /**/#endif |
| 58 | #endif /* XPM */ | |
| 59 | /**/#ifdef COLOR | |
| 60 | -#ifndef XPM | |
| 61 | -xlogin*greetColor: CadetBlue | |
| 62 | -#else | |
| 63 | +#ifdef XPM | |
| 64 | xlogin*borderWidth: 1 | |
| 65 | xlogin*frameWidth: 5 | |
| 66 | xlogin*innerFramesWidth: 2 | |
| 1d5726dc | 67 | @@ -47,6 +45,8 @@ |
| e23f9969 JR |
68 | xlogin*background: grey |
| 69 | !xlogin*foreground: darkgreen | |
| 70 | xlogin*greetColor: Blue3 | |
| 71 | +#else | |
| 1d5726dc | 72 | +login*greetColor: CadetBlue |
| e23f9969 JR |
73 | #endif /* XPM */ |
| 74 | xlogin*failColor: red | |
| 75 | *Foreground: black | |
| 1d5726dc JR |
76 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile |
| 77 | --- XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile Wed Jun 14 21:43:32 2000 | |
| 78 | +++ XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile Thu Dec 21 13:20:13 2000 | |
| 79 | @@ -77,8 +77,6 @@ | |
| e23f9969 JR |
80 | DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \ |
| 81 | $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) | |
| e23f9969 | 82 | |
| 1d5726dc JR |
83 | -SHLIBDIR = $(XDMDIR) |
| 84 | - | |
| e23f9969 JR |
85 | SRCS = greet.c verify.c Login.c |
| 86 | OBJS = greet.o verify.o Login.o | |
| fa8984c3 | 87 |