]>
Commit | Line | Data |
---|---|---|
42389106 | 1 | diff -Nru xc.orig/Makefile xc/Makefile |
2 | --- xc.orig/Makefile 2003-11-02 05:38:01.000000000 +0100 | |
3 | +++ xc/Makefile 2003-12-23 12:09:12.071230112 +0100 | |
4 | @@ -8,7 +8,7 @@ | |
5 | # or add "MAKE = make" to this file. | |
6 | ||
7 | RELEASE = "Release 6.6" | |
8 | -SHELL = /bin/sh | |
9 | +SHELL = /bin/sh -e | |
10 | RM = rm -f | |
11 | MV = mv | |
12 | WORLDOPTS = | |
13 | diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf | |
14 | --- xc.orig/config/cf/Imake.cf 2003-12-19 05:40:33.000000000 +0100 | |
15 | +++ xc/config/cf/Imake.cf 2003-12-23 12:09:11.983243488 +0100 | |
16 | @@ -784,6 +784,10 @@ | |
b19d4d8b JR |
17 | # define s390Architecture |
18 | # undef __s390__ | |
19 | # endif /* s390 */ | |
e1fe05b9 JR |
20 | +# ifdef alpha |
21 | +# define AlphaArchitecture | |
22 | +# undef alpha | |
b19d4d8b | 23 | +# endif /* alpha */ |
e1fe05b9 JR |
24 | # ifdef __alpha |
25 | # define AlphaArchitecture | |
26 | # undef __alpha | |
42389106 | 27 | diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl |
28 | --- xc.orig/config/cf/Imake.tmpl 2003-11-21 06:55:02.000000000 +0100 | |
29 | +++ xc/config/cf/Imake.tmpl 2003-12-23 12:09:11.992242120 +0100 | |
e9cc699d | 30 | @@ -261,7 +261,7 @@ |
e1fe05b9 JR |
31 | |
32 | #ifndef BuildHtmlManPages | |
33 | #ifdef RmanCmd | |
34 | -#define BuildHtmlManPages YES | |
35 | +#define BuildHtmlManPages NO | |
36 | #else | |
37 | #define BuildHtmlManPages NO | |
38 | #endif | |
fa4a3447 | 39 | @@ -854,11 +854,7 @@ |
e1fe05b9 JR |
40 | #define LintlibDir $(USRLIBDIR)/lint |
41 | #endif | |
42 | #ifndef SystemManDirectory | |
43 | -#if SystemV4 | |
44 | #define SystemManDirectory /usr/share/man | |
45 | -#else | |
46 | -#define SystemManDirectory /usr/man | |
47 | -#endif | |
48 | #endif | |
49 | #ifndef ManDirectoryRoot | |
50 | #ifdef ProjectRoot | |
fa4a3447 | 51 | @@ -998,7 +994,7 @@ |
e1fe05b9 JR |
52 | #define NoRConst NO /* YES if const for structs of funcs is bad */ |
53 | #endif | |
54 | #ifndef InstPgmFlags | |
55 | -#define InstPgmFlags -s | |
56 | +#define InstPgmFlags | |
57 | #endif | |
58 | #ifndef InstBinFlags | |
59 | #define InstBinFlags -m 0755 | |
fa4a3447 | 60 | @@ -1140,7 +1136,7 @@ |
2452d5b7 | 61 | #define CppCmd /LibDirName/cpp |
8a78032e JR |
62 | #endif |
63 | #ifndef RawCppCmd | |
64 | -#define RawCppCmd CppCmd -undef | |
65 | +#define RawCppCmd CppCmd | |
66 | #endif | |
67 | #ifndef CppNoLineInfoOption | |
68 | #define CppNoLineInfoOption /**/ | |
42389106 | 69 | diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl |
70 | --- xc.orig/config/cf/X11.tmpl 2003-12-19 05:41:17.000000000 +0100 | |
71 | +++ xc/config/cf/X11.tmpl 2003-12-23 12:09:12.042234520 +0100 | |
72 | @@ -1262,8 +1262,12 @@ | |
2452d5b7 | 73 | # define UsbMouseSupport NO |
e1fe05b9 | 74 | #endif |
b19d4d8b | 75 | |
e1fe05b9 JR |
76 | +#ifndef EtcX11Directory |
77 | +#define EtcX11Directory /etc/X11 | |
78 | +#endif | |
b19d4d8b | 79 | + |
e1fe05b9 JR |
80 | #ifndef DefaultFSConfigFile |
81 | -#define DefaultFSConfigFile $(LIBDIR)/fs/config | |
82 | +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config | |
83 | #endif | |
84 | ||
85 | /* X-TrueType settings */ | |
42389106 | 86 | @@ -1389,7 +1393,7 @@ |
b19d4d8b | 87 | #define ConfigDir $(LIBDIR)/config |
e1fe05b9 JR |
88 | #endif |
89 | #ifndef DocDir | |
90 | -#define DocDir $(LIBDIR)/doc | |
91 | +#define DocDir $(LIBDIR)/share/doc | |
92 | #endif | |
93 | #ifndef DocHtmlDir | |
94 | #define DocHtmlDir $(DOCDIR)/html | |
42389106 | 95 | @@ -1401,31 +1405,31 @@ |
e9cc699d | 96 | #define DocPdfDir $(DOCDIR)/PDF |
e1fe05b9 JR |
97 | #endif |
98 | #ifndef FontDir | |
99 | -#define FontDir $(LIBDIR)/fonts | |
100 | +#define FontDir /usr/share/fonts | |
101 | #endif | |
102 | #ifndef AdmDir | |
103 | -#define AdmDir /usr/adm | |
104 | +#define AdmDir /var/log | |
105 | #endif | |
106 | #ifndef XinitDir | |
107 | -#define XinitDir $(LIBDIR)/xinit | |
108 | +#define XinitDir $(ETCX11DIR)/xinit | |
109 | #endif | |
110 | #ifndef XdmDir | |
111 | -#define XdmDir $(LIBDIR)/xdm | |
112 | +#define XdmDir $(ETCX11DIR)/xdm | |
113 | #endif | |
114 | #ifndef XdmVarDir | |
115 | #define XdmVarDir $(VARLIBDIR)/xdm | |
116 | #endif | |
117 | #ifndef XdmAuthDir | |
118 | -#define XdmAuthDir $(LIBDIR)/xdm | |
119 | +#define XdmAuthDir $(ETCX11DIR)/xdm | |
120 | #endif | |
121 | #ifndef XdmConfigurationSubdirectory /* under xdm sources */ | |
122 | #define XdmConfigurationSubdirectory config | |
123 | #endif | |
124 | #ifndef TwmDir | |
125 | -#define TwmDir $(LIBDIR)/twm | |
126 | +#define TwmDir $(ETCX11DIR)/twm | |
127 | #endif | |
128 | #ifndef XsmDir | |
129 | -#define XsmDir $(LIBDIR)/xsm | |
130 | +#define XsmDir $(ETCX11DIR)/xsm | |
131 | #endif | |
132 | #ifndef NlsDir | |
133 | #define NlsDir $(LIBDIR)/nls | |
42389106 | 134 | @@ -1434,23 +1438,20 @@ |
e9cc699d | 135 | #define XLocaleDir $(LIBDIR)/locale |
e1fe05b9 JR |
136 | #endif |
137 | #ifndef LbxproxyDir | |
138 | -#define LbxproxyDir $(LIBDIR)/lbxproxy | |
139 | +#define LbxproxyDir $(ETCX11DIR)/lbxproxy | |
140 | #endif | |
141 | #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */ | |
142 | #define LbxproxyConfigSubdir config | |
143 | #endif | |
144 | #ifndef ProxyManagerDir | |
145 | -#define ProxyManagerDir $(LIBDIR)/proxymngr | |
146 | +#define ProxyManagerDir $(ETCX11DIR)/proxymngr | |
147 | #endif | |
148 | #ifndef ServerConfigDir | |
149 | -#define ServerConfigDir $(LIBDIR)/xserver | |
150 | +#define ServerConfigDir $(ETCX11DIR)/xserver | |
151 | #endif | |
152 | #ifndef XPrintDir | |
153 | #define XPrintDir ServerConfigDir | |
e1fe05b9 JR |
154 | #endif |
155 | -#ifndef EtcX11Directory | |
156 | -#define EtcX11Directory /etc/X11 | |
157 | -#endif | |
158 | #ifndef InstallSecurityConfig | |
159 | #define InstallSecurityConfig YES /* Install sample security policy */ | |
160 | #endif | |
42389106 | 161 | @@ -1482,10 +1483,10 @@ |
e1fe05b9 JR |
162 | #define OsNameDefines /* as nothing */ |
163 | #endif | |
164 | #ifndef DefaultUserPath /* for xdm */ | |
165 | -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb | |
8a78032e | 166 | +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) |
e1fe05b9 JR |
167 | #endif |
168 | #ifndef DefaultSystemPath /* for xdm */ | |
169 | -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb | |
8a78032e | 170 | +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) |
e1fe05b9 JR |
171 | #endif |
172 | #ifndef DefaultSystemShell /* for xdm to set in SHELL */ | |
173 | #define DefaultSystemShell BourneShell | |
42389106 | 174 | @@ -1614,7 +1615,7 @@ |
e1fe05b9 JR |
175 | |
176 | HTMLINDEXCMD = HtmlIndexCmd | |
177 | ||
178 | - DOCUTILSRC = $(XTOP)/doc/util | |
179 | + DOCUTILSRC = $(XTOP)/share/doc/util | |
180 | CLIENTSRC = $(TOP)/clients | |
181 | DEMOSRC = $(TOP)/demos | |
182 | XDOCMACROS = $(DOCUTILSRC)/macros.t | |
42389106 | 183 | @@ -1628,7 +1629,7 @@ |
e1fe05b9 JR |
184 | SERVERSRC = $(XTOP)/programs/Xserver |
185 | CONTRIBSRC = ContribDir | |
186 | UNSUPPORTEDSRC = UnsupportedDir | |
187 | - DOCSRC = $(XTOP)/doc | |
188 | + DOCSRC = $(XTOP)/share/doc | |
189 | RGBSRC = $(XTOP)/programs/rgb | |
190 | BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf | |
191 | MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir | |
42389106 | 192 | diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf |
193 | --- xc.orig/config/cf/linux.cf 2003-12-19 05:41:59.000000000 +0100 | |
194 | +++ xc/config/cf/linux.cf 2003-12-23 12:09:12.008239688 +0100 | |
195 | @@ -333,7 +333,7 @@ | |
196 | */ | |
197 | #if BuildXF86DRI | |
198 | # if defined(i386Architecture) | |
199 | -# define BuildLibGlxWithoutPIC YES | |
200 | +# define BuildLibGlxWithoutPIC NO | |
201 | # endif | |
202 | #endif | |
203 | ||
204 | @@ -720,7 +720,7 @@ | |
205 | ||
206 | #define HasVarRun YES | |
207 | #ifndef VarDbDirectory | |
208 | -# define VarDbDirectory $(VARDIR)/lib | |
209 | +# define VarDbDirectory /var/lib | |
210 | #endif | |
211 | ||
212 | #ifndef XF86OSCardDrivers | |
213 | diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def | |
214 | --- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100 | |
215 | +++ xc/config/cf/site.def 2003-12-23 12:09:12.014238776 +0100 | |
216 | @@ -119,10 +119,14 @@ | |
217 | #define HasSentinel YES | |
218 | */ | |
219 | ||
220 | -/* | |
221 | #undef DefaultUserPath | |
222 | -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin | |
223 | -*/ | |
224 | +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) | |
225 | +#undef DefaultSystemPath | |
226 | +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) | |
227 | + | |
228 | + | |
229 | +#define HasPam YES | |
230 | +#define HasPamMisc YES | |
231 | ||
232 | ||
233 | /* You do NOT need SetUID if you only run the server under xdm */ | |
234 | diff -Nru xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def | |
235 | --- xc.orig/config/cf/xf86site.def 2003-09-10 13:00:03.000000000 +0200 | |
236 | +++ xc/config/cf/xf86site.def 2003-12-23 12:09:12.050233304 +0100 | |
e9cc699d | 237 | @@ -260,8 +260,8 @@ |
2452d5b7 | 238 | /* |
239 | * To not build/install the Cyrillic fonts, uncomment the following | |
240 | * | |
241 | -#define BuildCyrillicFonts NO | |
242 | */ | |
243 | +#define BuildCyrillicFonts YES | |
244 | ||
245 | /* | |
246 | * To not install the local font directory, uncomment the following | |
e9cc699d | 247 | @@ -307,27 +307,26 @@ |
2452d5b7 | 248 | * HasGlide2 to YES and set the Glide2IncDir variable. |
249 | * HasGlide2 is per default NO. | |
250 | * | |
251 | -#define HasGlide2 YES | |
252 | */ | |
253 | +#define HasGlide2 YES | |
254 | ||
255 | /* | |
256 | * Set the path to your Glide include files. | |
257 | * | |
258 | -#define Glide2IncDir /usr/include/glide | |
259 | */ | |
260 | +#define Glide2IncDir /usr/include/glide | |
261 | ||
262 | /* | |
263 | * Have glide 3? | |
264 | * | |
265 | -#define HasGlide3 YES | |
266 | */ | |
267 | +#define HasGlide3 YES | |
268 | ||
269 | /* | |
270 | * Set the path to your Glide 3 include files. | |
271 | * | |
272 | -#define Glide3IncDir /usr/include/glide3 | |
273 | */ | |
274 | - | |
275 | +#define Glide3IncDir /usr/include/glide3 | |
276 | ||
277 | ||
278 | /* | |
e9cc699d | 279 | @@ -429,8 +428,8 @@ |
e1fe05b9 JR |
280 | * Some Linux releases don't have a libtermcap. In this case you may need |
281 | * to uncomment the following | |
282 | * | |
283 | -#define TermcapLibrary -lncurses | |
284 | */ | |
285 | +#define TermcapLibrary -lncurses | |
286 | ||
287 | /* | |
e9cc699d | 288 | * Build a server that dynamically loads the modules by setting |
289 | @@ -605,8 +604,8 @@ | |
e1fe05b9 JR |
290 | * To forceably build static libraries in addition to shared libraries, |
291 | * uncomment this. | |
292 | * | |
293 | -#define ForceNormalLib YES | |
294 | */ | |
295 | +#define ForceNormalLib YES | |
296 | ||
297 | /* | |
298 | * Uncomment this if your default tools (eg, gcc, ld, as, etc) are | |
42389106 | 299 | diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf |
300 | --- xc.orig/config/cf/xfree86.cf 2003-11-21 06:55:07.000000000 +0100 | |
301 | +++ xc/config/cf/xfree86.cf 2003-12-23 12:09:12.055232544 +0100 | |
e9cc699d | 302 | @@ -128,7 +128,7 @@ |
e1fe05b9 JR |
303 | #define XConfigFile XF86Config |
304 | #endif | |
305 | #ifndef XConfigDir | |
306 | -#define XConfigDir $(LIBDIR) | |
307 | +#define XConfigDir $(ETCX11DIR) | |
308 | #endif | |
b19d4d8b JR |
309 | #ifndef XLogFile |
310 | #define XLogFile XFree86 | |
e9cc699d | 311 | @@ -760,7 +760,7 @@ |
312 | ||
91e66983 | 313 | # ifndef XF86CardDrivers |
e9cc699d | 314 | # define XF86CardDrivers mga glint nv s3 s3virge sis savage \ |
315 | - trident chips tdfx fbdev ati \ | |
316 | + trident chips fbdev ati \ | |
317 | DevelDrivers newport \ | |
91e66983 | 318 | XF86OSCardDrivers XF86ExtraCardDrivers |
319 | # endif | |
42389106 | 320 | diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c |
321 | --- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200 | |
322 | +++ xc/config/imake/imake.c 2003-12-23 12:09:12.060231784 +0100 | |
2452d5b7 | 323 | @@ -1057,6 +1057,7 @@ |
324 | static char* suse = "/etc/SuSE-release"; | |
e1fe05b9 JR |
325 | static char* redhat = "/etc/redhat-release"; |
326 | static char* debian = "/etc/debian_version"; | |
327 | + static char* pld = "/etc/pld-release"; | |
328 | ||
329 | fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); | |
330 | fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); | |
2452d5b7 | 331 | @@ -1071,6 +1072,7 @@ |
e1fe05b9 JR |
332 | fprintf (inFile, "%s\n", "#define LinuxTurbo 10"); |
333 | fprintf (inFile, "%s\n", "#define LinuxWare 11"); | |
334 | fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); | |
335 | + fprintf (inFile, "%s\n", "#define LinuxPLD 13"); | |
336 | ||
2452d5b7 | 337 | #ifdef CROSSCOMPILE |
338 | if (CrossCompiling) { | |
339 | @@ -1097,6 +1099,11 @@ | |
e1fe05b9 | 340 | * at the content of /etc/debian_version */ |
2452d5b7 | 341 | return; |
342 | } | |
e1fe05b9 JR |
343 | + if (lstat (pld, &sb) == 0) { |
344 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD"); | |
345 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD"); | |
2452d5b7 | 346 | + return; |
347 | + } | |
e1fe05b9 | 348 | /* what's the definitive way to tell what any particular distribution is? */ |
2452d5b7 | 349 | |
350 | fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); | |
42389106 | 351 | diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile |
352 | --- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-19 05:48:39.000000000 +0100 | |
353 | +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-23 12:09:12.000000000 +0100 | |
354 | @@ -107,7 +107,7 @@ | |
2452d5b7 | 355 | |
42389106 | 356 | #if HasNCurses |
357 | CURSESLIB = NCursesLibName | |
358 | -CURSESDEFINES = -DHAS_NCURSES | |
359 | +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses | |
360 | #endif | |
361 | ||
362 | XF86CONFIGFILE = XConfigFile | |
363 | diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp | |
364 | --- xc.orig/programs/xdm/config/Xres.cpp 2003-11-21 07:01:06.000000000 +0100 | |
365 | +++ xc/programs/xdm/config/Xres.cpp 2003-12-23 12:09:12.000000000 +0100 | |
fa4a3447 AM |
366 | @@ -71,9 +71,9 @@ |
367 | XHASHendif | |
e1fe05b9 | 368 | #ifdef XPM |
8b7622d8 | 369 | -XHASHif PLANES >= 8 |
e1fe05b9 | 370 | -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP |
8b7622d8 | 371 | +XHASHif PLANES > 8 |
8a78032e | 372 | +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm |
fa4a3447 | 373 | XHASHelse |
e1fe05b9 JR |
374 | -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP |
375 | +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm | |
fa4a3447 | 376 | XHASHendif |
e1fe05b9 JR |
377 | xlogin*useShape: true |
378 | xlogin*logoPadding: 10 | |
42389106 | 379 | diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c |
380 | --- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200 | |
381 | +++ xc/programs/xdm/resource.c 2003-12-23 12:09:12.000000000 +0100 | |
e9cc699d | 382 | @@ -84,31 +84,31 @@ |
e1fe05b9 | 383 | */ |
e9cc699d | 384 | #ifndef __EMX__ |
e1fe05b9 JR |
385 | #ifndef DEF_SERVER_LINE |
386 | -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0" | |
47559fe6 | 387 | +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0" |
e1fe05b9 JR |
388 | #endif |
389 | #ifndef XRDB_PROGRAM | |
390 | -#define XRDB_PROGRAM "/usr/bin/X11/xrdb" | |
47559fe6 | 391 | +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb" |
e1fe05b9 JR |
392 | #endif |
393 | #ifndef DEF_SESSION | |
394 | -#define DEF_SESSION "/usr/bin/X11/xterm -ls" | |
47559fe6 | 395 | +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls" |
e1fe05b9 JR |
396 | #endif |
397 | #ifndef DEF_USER_PATH | |
398 | -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb" | |
47559fe6 | 399 | +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin" |
e1fe05b9 JR |
400 | #endif |
401 | #ifndef DEF_SYSTEM_PATH | |
402 | -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb" | |
47559fe6 | 403 | +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin" |
e1fe05b9 JR |
404 | #endif |
405 | #ifndef DEF_SYSTEM_SHELL | |
406 | #define DEF_SYSTEM_SHELL "/bin/sh" | |
407 | #endif | |
408 | #ifndef DEF_FAILSAFE_CLIENT | |
409 | -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm" | |
47559fe6 | 410 | +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm" |
e1fe05b9 JR |
411 | #endif |
412 | #ifndef DEF_XDM_CONFIG | |
413 | -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config" | |
414 | +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config" | |
415 | #endif | |
416 | #ifndef DEF_CHOOSER | |
417 | -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser" | |
418 | +#define DEF_CHOOSER "/etc/X11/xdm/chooser" | |
419 | #endif | |
420 | #ifndef DEF_AUTH_NAME | |
421 | #ifdef HASXDMAUTH | |
e9cc699d | 422 | @@ -118,7 +118,7 @@ |
e1fe05b9 JR |
423 | #endif |
424 | #endif | |
425 | #ifndef DEF_AUTH_DIR | |
426 | -#define DEF_AUTH_DIR "/usr/lib/X11/xdm" | |
427 | +#define DEF_AUTH_DIR "/etc/X11/xdm" | |
428 | #endif | |
429 | #ifndef DEF_USER_AUTH_DIR | |
430 | #define DEF_USER_AUTH_DIR "/tmp" | |
42389106 | 431 | diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile |
432 | --- xc.orig/programs/xinit/Imakefile 2003-11-21 07:01:12.000000000 +0100 | |
433 | +++ xc/programs/xinit/Imakefile 2003-12-23 12:09:12.000000000 +0100 | |
fa4a3447 AM |
434 | @@ -46,11 +46,12 @@ |
435 | #endif | |
e1fe05b9 JR |
436 | InstallManPage(startx,$(MANDIR)) |
437 | ||
438 | -#if InstallXinitConfig | |
439 | -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
440 | -#else | |
441 | -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
442 | -#endif | |
443 | +XCOMM Red Hat gets this from a different package | |
444 | +XCOMM #if InstallXinitConfig | |
445 | +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
446 | +XCOMM #else | |
447 | +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
448 | +XCOMM #endif | |
e1fe05b9 JR |
449 | |
450 | LinkConfDirectory(xinit,.,xinit,.) | |
2452d5b7 | 451 | |
42389106 | 452 | diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile |
453 | --- xc.orig/programs/xterm/Imakefile 2003-12-19 05:51:51.000000000 +0100 | |
454 | +++ xc/programs/xterm/Imakefile 2003-12-23 12:11:05.000000000 +0100 | |
e1fe05b9 JR |
455 | @@ -36,6 +36,10 @@ |
456 | #define XkbClientLibs /**/ | |
457 | #endif | |
458 | ||
459 | +#if InstallXtermSetUID | |
460 | +#undef InstallXtermSetUID | |
461 | +#endif | |
462 | + | |
463 | #ifndef SpecialCObjectRule | |
464 | #define SpecialCObjectRule(module,ignore,defines) \ | |
465 | module.o: ; $(CC) -c defines $(CFLAGS) module.c | |
466 | @@ -57,6 +61,8 @@ | |
467 | PTYLIB = -lpucc | |
468 | #endif | |
469 | ||
470 | + PTYLIB = -lutil | |
471 | + | |
2452d5b7 | 472 | #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \ |
473 | (defined(LinuxArchitecture) && \ | |
474 | (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1)) | |
42389106 | 475 | @@ -116,7 +122,7 @@ |
e1fe05b9 | 476 | XKB_DEFINES = XkbClientDefines |
2452d5b7 | 477 | PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) |
42389106 | 478 | DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF) |
479 | - INCLUDES = -I. $(XRFINCLUDES) | |
480 | + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES) | |
e1fe05b9 JR |
481 | |
482 | #ifdef OS2Architecture | |
42389106 | 483 | MAINSRC = os2main.c |
484 | diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h | |
485 | --- xc.orig/programs/xterm/xterm.h 2003-12-19 05:51:52.000000000 +0100 | |
486 | +++ xc/programs/xterm/xterm.h 2003-12-23 12:09:12.000000000 +0100 | |
2452d5b7 | 487 | @@ -73,7 +73,7 @@ |
e1fe05b9 JR |
488 | #endif |
489 | ||
490 | #ifndef DFT_TERMTYPE | |
491 | -#define DFT_TERMTYPE "xterm" | |
492 | +#define DFT_TERMTYPE "xterm-color" | |
493 | #endif | |
494 | ||
495 | #ifndef X_NOT_POSIX |