]>
Commit | Line | Data |
---|---|---|
29044796 | 1 | --- XFree86-4.1.0.org/xc/Makefile Wed Mar 22 22:23:30 2000 |
2 | +++ XFree86-4.1.0/xc/Makefile Wed Dec 20 13:41:02 2000 | |
3 | @@ -8,10 +8,10 @@ | |
e1fe05b9 JR |
4 | # or add "MAKE = make" to this file. |
5 | ||
ea1f593a | 6 | RELEASE = "Release 6.6" |
e1fe05b9 JR |
7 | -SHELL = /bin/sh |
8 | +SHELL = /bin/sh -e | |
9 | RM = rm -f | |
10 | MV = mv | |
11 | -WORLDOPTS = -k | |
12 | +WORLDOPTS = | |
13 | WIN32WORLDOPTS = -i | |
14 | TOP = . | |
15 | CURRENT_DIR = . | |
b19d4d8b JR |
16 | diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.cf XFree86-4.0.2/xc/config/cf/Imake.cf |
17 | --- XFree86-4.0.2.org/xc/config/cf/Imake.cf Mon Nov 6 23:53:47 2000 | |
18 | +++ XFree86-4.0.2/xc/config/cf/Imake.cf Wed Dec 20 13:41:02 2000 | |
19 | @@ -689,6 +689,10 @@ | |
20 | # define s390Architecture | |
21 | # undef __s390__ | |
22 | # endif /* s390 */ | |
e1fe05b9 JR |
23 | +# ifdef alpha |
24 | +# define AlphaArchitecture | |
25 | +# undef alpha | |
b19d4d8b | 26 | +# endif /* alpha */ |
e1fe05b9 JR |
27 | # ifdef __alpha |
28 | # define AlphaArchitecture | |
29 | # undef __alpha | |
b19d4d8b JR |
30 | diff -Nur XFree86-4.0.2.org/xc/config/cf/Imake.tmpl XFree86-4.0.2/xc/config/cf/Imake.tmpl |
31 | --- XFree86-4.0.2.org/xc/config/cf/Imake.tmpl Tue Dec 5 01:45:28 2000 | |
32 | +++ XFree86-4.0.2/xc/config/cf/Imake.tmpl Wed Dec 20 13:41:02 2000 | |
33 | @@ -220,7 +220,7 @@ | |
e1fe05b9 JR |
34 | |
35 | #ifndef BuildHtmlManPages | |
36 | #ifdef RmanCmd | |
37 | -#define BuildHtmlManPages YES | |
38 | +#define BuildHtmlManPages NO | |
39 | #else | |
40 | #define BuildHtmlManPages NO | |
41 | #endif | |
b19d4d8b | 42 | @@ -686,11 +686,7 @@ |
e1fe05b9 JR |
43 | #define LintlibDir $(USRLIBDIR)/lint |
44 | #endif | |
45 | #ifndef SystemManDirectory | |
46 | -#if SystemV4 | |
47 | #define SystemManDirectory /usr/share/man | |
48 | -#else | |
49 | -#define SystemManDirectory /usr/man | |
50 | -#endif | |
51 | #endif | |
52 | #ifndef ManDirectoryRoot | |
53 | #ifdef ProjectRoot | |
b19d4d8b | 54 | @@ -817,7 +813,7 @@ |
e1fe05b9 JR |
55 | #define NoRConst NO /* YES if const for structs of funcs is bad */ |
56 | #endif | |
57 | #ifndef InstPgmFlags | |
58 | -#define InstPgmFlags -s | |
59 | +#define InstPgmFlags | |
60 | #endif | |
61 | #ifndef InstBinFlags | |
62 | #define InstBinFlags -m 0755 | |
b19d4d8b | 63 | @@ -958,7 +954,7 @@ |
8a78032e JR |
64 | #define CppCmd /lib/cpp |
65 | #endif | |
66 | #ifndef RawCppCmd | |
67 | -#define RawCppCmd CppCmd -undef | |
68 | +#define RawCppCmd CppCmd | |
69 | #endif | |
70 | #ifndef CppNoLineInfoOption | |
71 | #define CppNoLineInfoOption /**/ | |
b19d4d8b JR |
72 | diff -Nur XFree86-4.0.2.org/xc/config/cf/X11.tmpl XFree86-4.0.2/xc/config/cf/X11.tmpl |
73 | --- XFree86-4.0.2.org/xc/config/cf/X11.tmpl Sat Dec 16 07:39:25 2000 | |
74 | +++ XFree86-4.0.2/xc/config/cf/X11.tmpl Wed Dec 20 13:41:02 2000 | |
75 | @@ -882,8 +882,12 @@ | |
e1fe05b9 JR |
76 | #endif |
77 | #endif | |
b19d4d8b | 78 | |
e1fe05b9 JR |
79 | +#ifndef EtcX11Directory |
80 | +#define EtcX11Directory /etc/X11 | |
81 | +#endif | |
b19d4d8b | 82 | + |
e1fe05b9 JR |
83 | #ifndef DefaultFSConfigFile |
84 | -#define DefaultFSConfigFile $(LIBDIR)/fs/config | |
85 | +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config | |
86 | #endif | |
87 | ||
88 | /* X-TrueType settings */ | |
b19d4d8b JR |
89 | @@ -1002,7 +1006,7 @@ |
90 | #define ConfigDir $(LIBDIR)/config | |
e1fe05b9 JR |
91 | #endif |
92 | #ifndef DocDir | |
93 | -#define DocDir $(LIBDIR)/doc | |
94 | +#define DocDir $(LIBDIR)/share/doc | |
95 | #endif | |
96 | #ifndef DocHtmlDir | |
97 | #define DocHtmlDir $(DOCDIR)/html | |
b19d4d8b | 98 | @@ -1011,31 +1015,31 @@ |
e1fe05b9 JR |
99 | #define DocPsDir $(DOCDIR)/PostScript |
100 | #endif | |
101 | #ifndef FontDir | |
102 | -#define FontDir $(LIBDIR)/fonts | |
103 | +#define FontDir /usr/share/fonts | |
104 | #endif | |
105 | #ifndef AdmDir | |
106 | -#define AdmDir /usr/adm | |
107 | +#define AdmDir /var/log | |
108 | #endif | |
109 | #ifndef XinitDir | |
110 | -#define XinitDir $(LIBDIR)/xinit | |
111 | +#define XinitDir $(ETCX11DIR)/xinit | |
112 | #endif | |
113 | #ifndef XdmDir | |
114 | -#define XdmDir $(LIBDIR)/xdm | |
115 | +#define XdmDir $(ETCX11DIR)/xdm | |
116 | #endif | |
117 | #ifndef XdmVarDir | |
118 | #define XdmVarDir $(VARLIBDIR)/xdm | |
119 | #endif | |
120 | #ifndef XdmAuthDir | |
121 | -#define XdmAuthDir $(LIBDIR)/xdm | |
122 | +#define XdmAuthDir $(ETCX11DIR)/xdm | |
123 | #endif | |
124 | #ifndef XdmConfigurationSubdirectory /* under xdm sources */ | |
125 | #define XdmConfigurationSubdirectory config | |
126 | #endif | |
127 | #ifndef TwmDir | |
128 | -#define TwmDir $(LIBDIR)/twm | |
129 | +#define TwmDir $(ETCX11DIR)/twm | |
130 | #endif | |
131 | #ifndef XsmDir | |
132 | -#define XsmDir $(LIBDIR)/xsm | |
133 | +#define XsmDir $(ETCX11DIR)/xsm | |
134 | #endif | |
135 | #ifndef NlsDir | |
136 | #define NlsDir $(LIBDIR)/nls | |
b19d4d8b | 137 | @@ -1047,23 +1051,20 @@ |
e1fe05b9 JR |
138 | #define PexApiDir $(LIBDIR)/PEX |
139 | #endif | |
140 | #ifndef LbxproxyDir | |
141 | -#define LbxproxyDir $(LIBDIR)/lbxproxy | |
142 | +#define LbxproxyDir $(ETCX11DIR)/lbxproxy | |
143 | #endif | |
144 | #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */ | |
145 | #define LbxproxyConfigSubdir config | |
146 | #endif | |
147 | #ifndef ProxyManagerDir | |
148 | -#define ProxyManagerDir $(LIBDIR)/proxymngr | |
149 | +#define ProxyManagerDir $(ETCX11DIR)/proxymngr | |
150 | #endif | |
151 | #ifndef ServerConfigDir | |
152 | -#define ServerConfigDir $(LIBDIR)/xserver | |
153 | +#define ServerConfigDir $(ETCX11DIR)/xserver | |
154 | #endif | |
155 | #ifndef XPrintDir | |
156 | #define XPrintDir ServerConfigDir | |
e1fe05b9 JR |
157 | #endif |
158 | -#ifndef EtcX11Directory | |
159 | -#define EtcX11Directory /etc/X11 | |
160 | -#endif | |
161 | #ifndef InstallSecurityConfig | |
162 | #define InstallSecurityConfig YES /* Install sample security policy */ | |
163 | #endif | |
b19d4d8b | 164 | @@ -1095,10 +1096,10 @@ |
e1fe05b9 JR |
165 | #define OsNameDefines /* as nothing */ |
166 | #endif | |
167 | #ifndef DefaultUserPath /* for xdm */ | |
168 | -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb | |
8a78032e | 169 | +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) |
e1fe05b9 JR |
170 | #endif |
171 | #ifndef DefaultSystemPath /* for xdm */ | |
172 | -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb | |
8a78032e | 173 | +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) |
e1fe05b9 JR |
174 | #endif |
175 | #ifndef DefaultSystemShell /* for xdm to set in SHELL */ | |
176 | #define DefaultSystemShell BourneShell | |
b19d4d8b | 177 | @@ -1211,7 +1212,7 @@ |
e1fe05b9 JR |
178 | |
179 | HTMLINDEXCMD = HtmlIndexCmd | |
180 | ||
181 | - DOCUTILSRC = $(XTOP)/doc/util | |
182 | + DOCUTILSRC = $(XTOP)/share/doc/util | |
183 | CLIENTSRC = $(TOP)/clients | |
184 | DEMOSRC = $(TOP)/demos | |
185 | XDOCMACROS = $(DOCUTILSRC)/macros.t | |
b19d4d8b | 186 | @@ -1225,7 +1226,7 @@ |
e1fe05b9 JR |
187 | SERVERSRC = $(XTOP)/programs/Xserver |
188 | CONTRIBSRC = ContribDir | |
189 | UNSUPPORTEDSRC = UnsupportedDir | |
190 | - DOCSRC = $(XTOP)/doc | |
191 | + DOCSRC = $(XTOP)/share/doc | |
192 | RGBSRC = $(XTOP)/programs/rgb | |
193 | BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf | |
194 | MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir | |
b19d4d8b JR |
195 | diff -Nur XFree86-4.0.2.org/xc/config/cf/linux.cf XFree86-4.0.2/xc/config/cf/linux.cf |
196 | --- XFree86-4.0.2.org/xc/config/cf/linux.cf Thu Dec 14 20:24:08 2000 | |
197 | +++ XFree86-4.0.2/xc/config/cf/linux.cf Wed Dec 20 13:45:03 2000 | |
31df3500 | 198 | @@ -286,7 +286,7 @@ |
31df3500 JR |
199 | */ |
200 | #if BuildXF86DRI | |
ea1f593a | 201 | # if defined(i386Architecture) |
31df3500 JR |
202 | -# define BuildLibGlxWithoutPIC YES |
203 | +# define BuildLibGlxWithoutPIC NO | |
ea1f593a | 204 | # endif |
31df3500 JR |
205 | #endif |
206 | ||
31df3500 | 207 | @@ -298,7 +298,7 @@ |
b19d4d8b | 208 | # if defined(i386Architecture) || defined(ia64Architecture) |
e1fe05b9 JR |
209 | # if OSMajorVersion == 2 |
210 | /* Only tested for Linux 2.2.0 through 2.2.12 */ | |
211 | -# if OSMinorVersion == 2 && OSTeenyVersion <= 12 | |
212 | +# if OSMinorVersion == 2 | |
b19d4d8b | 213 | # define BuildXF86DRM YES |
e1fe05b9 JR |
214 | # else |
215 | /* Only tested for Linux 2.3.0 through 2.3.18 */ | |
b19d4d8b | 216 | @@ -565,7 +565,7 @@ |
e1fe05b9 JR |
217 | #define StandardCppDefines StandardDefines |
218 | ||
219 | #define HasVarRun YES | |
b19d4d8b | 220 | -#define VarDbDirectory $(VARDIR)/lib |
e1fe05b9 JR |
221 | +#define VarDbDirectory /var/lib |
222 | ||
223 | #ifndef XF86OSCardDrivers | |
b19d4d8b JR |
224 | # define XF86OSCardDrivers v4l |
225 | @@ -704,10 +704,10 @@ | |
e1fe05b9 JR |
226 | #endif |
227 | ||
228 | #ifndef LinkGLToUsrLib | |
b19d4d8b JR |
229 | -# define LinkGLToUsrLib YES |
230 | +# define LinkGLToUsrLib NO | |
e1fe05b9 | 231 | #endif |
b19d4d8b JR |
232 | # ifndef LinkGLToUsrInclude |
233 | -# define LinkGLToUsrInclude YES | |
234 | +# define LinkGLToUsrInclude NO | |
e1fe05b9 JR |
235 | #endif |
236 | ||
237 | ||
b19d4d8b JR |
238 | diff -Nur XFree86-4.0.2.org/xc/config/cf/site.def XFree86-4.0.2/xc/config/cf/site.def |
239 | --- XFree86-4.0.2.org/xc/config/cf/site.def Tue Jun 27 02:55:45 2000 | |
240 | +++ XFree86-4.0.2/xc/config/cf/site.def Wed Dec 20 13:41:02 2000 | |
54408bbb | 241 | @@ -131,10 +131,14 @@ |
e1fe05b9 JR |
242 | #define HasSentinel YES |
243 | */ | |
244 | ||
245 | -/* | |
246 | #undef DefaultUserPath | |
247 | -#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin | |
248 | -*/ | |
8a78032e | 249 | +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) |
e1fe05b9 | 250 | +#undef DefaultSystemPath |
8a78032e | 251 | +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) |
e1fe05b9 JR |
252 | + |
253 | + | |
254 | +#define HasPam YES | |
54408bbb | 255 | +#define HasPamMisc YES |
e1fe05b9 JR |
256 | |
257 | ||
258 | /* You do NOT need SetUID if you only run the server under xdm */ | |
b19d4d8b JR |
259 | diff -Nur XFree86-4.0.2.org/xc/config/cf/xf86site.def XFree86-4.0.2/xc/config/cf/xf86site.def |
260 | --- XFree86-4.0.2.org/xc/config/cf/xf86site.def Thu Dec 14 20:24:16 2000 | |
261 | +++ XFree86-4.0.2/xc/config/cf/xf86site.def Wed Dec 20 13:41:03 2000 | |
e1fe05b9 JR |
262 | @@ -134,16 +134,16 @@ |
263 | * Some Linux releases don't have a libtermcap. In this case you may need | |
264 | * to uncomment the following | |
265 | * | |
266 | -#define TermcapLibrary -lncurses | |
267 | */ | |
268 | +#define TermcapLibrary -lncurses | |
269 | ||
270 | /* | |
271 | * If you have Tk (which is required to build XF86Setup), uncomment this | |
272 | * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by | |
273 | * default. | |
274 | * | |
275 | -#define HasTk YES | |
276 | */ | |
277 | +#define HasTk YES | |
278 | ||
279 | /* | |
280 | * Set the paths and names for your Tk library if they don't match the | |
281 | @@ -156,25 +156,25 @@ | |
282 | * | |
283 | * Some Linux releases need TkLibDir set to /usr/X11R6/lib | |
284 | * | |
285 | -#define TkLibDir /usr/local/lib | |
286 | -#define TkIncDir /usr/local/include | |
287 | -#define TkLibName tk | |
288 | */ | |
289 | +#define TkLibDir /usr/lib | |
290 | +#define TkIncDir /usr/include | |
291 | +#define TkLibName tk | |
292 | ||
293 | /* | |
294 | * By default, XF86Setup is linked with a static Tk library. To change | |
295 | * that, uncomment the following line. | |
296 | * | |
297 | -#define XF86SetupUsesStaticTk NO | |
298 | */ | |
299 | +#define XF86SetupUsesStaticTk NO | |
300 | ||
301 | /* | |
302 | * If you have Tcl (which is required to build XF86Setup), uncomment this | |
303 | * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by | |
304 | * default. | |
305 | * | |
306 | -#define HasTcl YES | |
307 | */ | |
308 | +#define HasTcl YES | |
309 | ||
310 | /* | |
311 | * Set the paths and names for your Tcl library if they don't match the | |
312 | @@ -184,17 +184,17 @@ | |
313 | * | |
314 | * Some Linux releases need TclIncDir set to /usr/include/tcl. | |
315 | * | |
316 | -#define TclLibDir /usr/local/lib | |
317 | -#define TclIncDir /usr/local/include | |
318 | -#define TclLibName tcl | |
319 | */ | |
320 | +#define TclLibDir /usr/lib | |
321 | +#define TclIncDir /usr/include | |
322 | +#define TclLibName tcl | |
323 | ||
324 | /* | |
325 | * By default, XF86Setup is linked with a static Tcl library. To change | |
326 | * that, uncomment the following line. | |
327 | * | |
328 | -#define XF86SetupUsesStaticTcl NO | |
329 | */ | |
330 | +#define XF86SetupUsesStaticTcl NO | |
331 | ||
332 | /* | |
333 | * Build a server that dynamically loads the modules by setting | |
b19d4d8b | 334 | @@ -436,8 +436,8 @@ |
e1fe05b9 JR |
335 | /* |
336 | * To not build/install the Cyrillic fonts, uncomment the following | |
337 | * | |
338 | -#define BuildCyrillicFonts NO | |
339 | */ | |
340 | +#define BuildCyrillicFonts YES | |
341 | ||
342 | /* | |
343 | * To not build/install the Latin2 fonts, uncomment the following | |
b19d4d8b | 344 | @@ -626,8 +626,8 @@ |
e1fe05b9 JR |
345 | * To forceably build static libraries in addition to shared libraries, |
346 | * uncomment this. | |
347 | * | |
348 | -#define ForceNormalLib YES | |
349 | */ | |
350 | +#define ForceNormalLib YES | |
351 | ||
352 | /* | |
353 | * Uncomment this if your default tools (eg, gcc, ld, as, etc) are | |
b19d4d8b | 354 | @@ -713,26 +713,26 @@ |
e1fe05b9 JR |
355 | * HasGlide2 to YES and set the Glide2IncDir variable. |
356 | * HasGlide2 is per default NO. | |
357 | * | |
358 | -#define HasGlide2 YES | |
359 | */ | |
360 | +#define HasGlide2 YES | |
361 | ||
362 | /* | |
363 | * Set the path to your Glide include files. | |
364 | * | |
365 | -#define Glide2IncDir /usr/include/glide | |
366 | */ | |
367 | +#define Glide2IncDir /usr/include/glide | |
368 | ||
369 | /* | |
370 | * The 3Dfx 3D DRI driver requires glide 3. | |
371 | * | |
372 | -#define HasGlide3 YES | |
373 | */ | |
374 | +#define HasGlide3 YES | |
375 | ||
376 | /* | |
377 | * Set the path to your Glide 3 include files. | |
378 | * | |
379 | -#define Glide3IncDir /usr/include/glide3 | |
380 | */ | |
381 | +#define Glide3IncDir /usr/include/glide3 | |
382 | ||
383 | /* | |
384 | * Undefine the following if you don't want to have config files and | |
b19d4d8b JR |
385 | diff -Nur XFree86-4.0.2.org/xc/config/cf/xfree86.cf XFree86-4.0.2/xc/config/cf/xfree86.cf |
386 | --- XFree86-4.0.2.org/xc/config/cf/xfree86.cf Thu Dec 14 20:24:17 2000 | |
387 | +++ XFree86-4.0.2/xc/config/cf/xfree86.cf Wed Dec 20 13:52:03 2000 | |
388 | @@ -28,7 +28,7 @@ | |
e1fe05b9 JR |
389 | #define XConfigFile XF86Config |
390 | #endif | |
391 | #ifndef XConfigDir | |
392 | -#define XConfigDir $(LIBDIR) | |
393 | +#define XConfigDir $(ETCX11DIR) | |
394 | #endif | |
b19d4d8b JR |
395 | #ifndef XLogFile |
396 | #define XLogFile XFree86 | |
b19d4d8b JR |
397 | diff -Nur XFree86-4.0.2.org/xc/config/imake/imake.c XFree86-4.0.2/xc/config/imake/imake.c |
398 | --- XFree86-4.0.2.org/xc/config/imake/imake.c Wed Nov 29 17:33:50 2000 | |
399 | +++ XFree86-4.0.2/xc/config/imake/imake.c Wed Dec 20 13:41:03 2000 | |
400 | @@ -952,6 +952,7 @@ | |
e1fe05b9 JR |
401 | static char* yast = "/sbin/YaST"; |
402 | static char* redhat = "/etc/redhat-release"; | |
403 | static char* debian = "/etc/debian_version"; | |
404 | + static char* pld = "/etc/pld-release"; | |
405 | ||
406 | fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); | |
407 | fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); | |
b19d4d8b | 408 | @@ -966,6 +967,7 @@ |
e1fe05b9 JR |
409 | fprintf (inFile, "%s\n", "#define LinuxTurbo 10"); |
410 | fprintf (inFile, "%s\n", "#define LinuxWare 11"); | |
411 | fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); | |
412 | + fprintf (inFile, "%s\n", "#define LinuxPLD 13"); | |
413 | ||
414 | if (lstat (yast, &sb) == 0) { | |
415 | fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE"); | |
b19d4d8b | 416 | @@ -982,6 +984,11 @@ |
e1fe05b9 JR |
417 | fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian"); |
418 | /* You could also try to get the version of the Debian distrib by looking | |
419 | * at the content of /etc/debian_version */ | |
420 | + return; | |
421 | + } | |
422 | + if (lstat (pld, &sb) == 0) { | |
423 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD"); | |
424 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD"); | |
425 | return; | |
426 | } | |
427 | /* what's the definitive way to tell what any particular distribution is? */ | |
b19d4d8b JR |
428 | diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile |
429 | --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Sep 4 15:04:28 1999 | |
430 | +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Wed Dec 20 13:41:03 2000 | |
e1fe05b9 JR |
431 | @@ -118,7 +118,7 @@ |
432 | ||
433 | XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \ | |
434 | '-DPROJECTROOT="$(PROJECTROOT)"' \ | |
435 | - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \ | |
436 | + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \ | |
437 | $(SITE_FONT_PATH) $(SITE_RGB_DB) \ | |
438 | -DNO_WRAPPERS | |
439 | ||
b19d4d8b JR |
440 | diff -Nur XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl |
441 | --- XFree86-4.0.2.org/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sun Apr 5 18:15:52 1998 | |
442 | +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Wed Dec 20 13:41:03 2000 | |
e1fe05b9 JR |
443 | @@ -38,7 +38,7 @@ |
444 | set devid [lindex $DeviceIDs $idx] | |
445 | global Device_$devid | |
446 | set server [set Device_${devid}(Server)] | |
447 | - set linkname $Xwinhome/bin/X | |
448 | + set linkname /etc/X11/X | |
449 | set lastlink $linkname | |
450 | for {set nlinks 0} \ | |
451 | {[file exists $linkname] && [file type $linkname]=="link" \ | |
452 | @@ -74,7 +74,7 @@ | |
453 | set CWD [pwd] | |
454 | cd $linkdir | |
455 | catch "unlink X" ret | |
456 | - if [catch "link $Xwinhome/bin/XF86_$server X" ret] { | |
457 | + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] { | |
458 | mesg $messages(phase5.4) okay | |
459 | } else { | |
460 | mesg $messages(phase5.5) okay | |
b19d4d8b JR |
461 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp |
462 | --- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Wed Nov 29 17:46:09 2000 | |
463 | +++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Wed Dec 20 13:41:03 2000 | |
464 | @@ -66,9 +66,9 @@ | |
e1fe05b9 JR |
465 | /**/#endif |
466 | #ifdef XPM | |
fa05ba13 | 467 | -/**/#if PLANES >= 8 |
e1fe05b9 | 468 | -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP |
fa05ba13 | 469 | +/**/#if PLANES >= 15 |
8a78032e | 470 | +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm |
e1fe05b9 JR |
471 | /**/#else |
472 | -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP | |
473 | +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm | |
474 | /**/#endif | |
475 | xlogin*useShape: true | |
476 | xlogin*logoPadding: 10 | |
b19d4d8b JR |
477 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/resource.c XFree86-4.0.2/xc/programs/xdm/resource.c |
478 | --- XFree86-4.0.2.org/xc/programs/xdm/resource.c Sun Dec 6 07:08:49 1998 | |
479 | +++ XFree86-4.0.2/xc/programs/xdm/resource.c Wed Dec 20 13:41:03 2000 | |
e1fe05b9 JR |
480 | @@ -70,31 +70,31 @@ |
481 | */ | |
482 | #ifndef __EMX__ | |
483 | #ifndef DEF_SERVER_LINE | |
484 | -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0" | |
485 | +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0" | |
486 | #endif | |
487 | #ifndef XRDB_PROGRAM | |
488 | -#define XRDB_PROGRAM "/usr/bin/X11/xrdb" | |
489 | +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb" | |
490 | #endif | |
491 | #ifndef DEF_SESSION | |
492 | -#define DEF_SESSION "/usr/bin/X11/xterm -ls" | |
493 | +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls" | |
494 | #endif | |
495 | #ifndef DEF_USER_PATH | |
496 | -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb" | |
8a78032e | 497 | +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin" |
e1fe05b9 JR |
498 | #endif |
499 | #ifndef DEF_SYSTEM_PATH | |
500 | -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb" | |
8a78032e | 501 | +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin" |
e1fe05b9 JR |
502 | #endif |
503 | #ifndef DEF_SYSTEM_SHELL | |
504 | #define DEF_SYSTEM_SHELL "/bin/sh" | |
505 | #endif | |
506 | #ifndef DEF_FAILSAFE_CLIENT | |
507 | -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm" | |
508 | +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm" | |
509 | #endif | |
510 | #ifndef DEF_XDM_CONFIG | |
511 | -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config" | |
512 | +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config" | |
513 | #endif | |
514 | #ifndef DEF_CHOOSER | |
515 | -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser" | |
516 | +#define DEF_CHOOSER "/etc/X11/xdm/chooser" | |
517 | #endif | |
518 | #ifndef DEF_AUTH_NAME | |
519 | #ifdef HASXDMAUTH | |
520 | @@ -104,7 +104,7 @@ | |
521 | #endif | |
522 | #endif | |
523 | #ifndef DEF_AUTH_DIR | |
524 | -#define DEF_AUTH_DIR "/usr/lib/X11/xdm" | |
525 | +#define DEF_AUTH_DIR "/etc/X11/xdm" | |
526 | #endif | |
527 | #ifndef DEF_USER_AUTH_DIR | |
528 | #define DEF_USER_AUTH_DIR "/tmp" | |
b19d4d8b JR |
529 | diff -Nur XFree86-4.0.2.org/xc/programs/xinit/Imakefile XFree86-4.0.2/xc/programs/xinit/Imakefile |
530 | --- XFree86-4.0.2.org/xc/programs/xinit/Imakefile Tue Dec 5 01:59:44 2000 | |
531 | +++ XFree86-4.0.2/xc/programs/xinit/Imakefile Wed Dec 20 13:41:03 2000 | |
532 | @@ -41,11 +41,13 @@ | |
e1fe05b9 JR |
533 | InstallNamedProg(startx,startx,$(BINDIR)) |
534 | InstallManPage(startx,$(MANDIR)) | |
535 | ||
536 | -#if InstallXinitConfig | |
537 | -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
538 | -#else | |
539 | -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
540 | -#endif | |
541 | +XCOMM Red Hat gets this from a different package | |
542 | +XCOMM #if InstallXinitConfig | |
543 | +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
544 | +XCOMM #else | |
545 | +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
546 | +XCOMM #endif | |
547 | + | |
548 | #endif | |
549 | ||
550 | LinkConfDirectory(xinit,.,xinit,.) | |
b19d4d8b JR |
551 | diff -Nur XFree86-4.0.2.org/xc/programs/xterm/Imakefile XFree86-4.0.2/xc/programs/xterm/Imakefile |
552 | --- XFree86-4.0.2.org/xc/programs/xterm/Imakefile Tue Dec 5 02:00:14 2000 | |
553 | +++ XFree86-4.0.2/xc/programs/xterm/Imakefile Wed Dec 20 13:43:30 2000 | |
e1fe05b9 JR |
554 | @@ -36,6 +36,10 @@ |
555 | #define XkbClientLibs /**/ | |
556 | #endif | |
557 | ||
558 | +#if InstallXtermSetUID | |
559 | +#undef InstallXtermSetUID | |
560 | +#endif | |
561 | + | |
562 | #ifndef SpecialCObjectRule | |
563 | #define SpecialCObjectRule(module,ignore,defines) \ | |
564 | module.o: ; $(CC) -c defines $(CFLAGS) module.c | |
565 | @@ -57,6 +61,8 @@ | |
566 | PTYLIB = -lpucc | |
567 | #endif | |
568 | ||
569 | + PTYLIB = -lutil | |
570 | + | |
571 | #if ((LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1)) | |
572 | PTYLIB = -lutil | |
573 | #endif | |
b19d4d8b | 574 | @@ -109,7 +115,7 @@ |
e1fe05b9 JR |
575 | -DOSMINORVERSION=$(OSMINORVERSION) |
576 | MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */ | |
577 | XKB_DEFINES = XkbClientDefines | |
b19d4d8b JR |
578 | - DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) |
579 | + DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) | |
e1fe05b9 JR |
580 | |
581 | #ifdef OS2Architecture | |
582 | MAINSRC = os2main.c | |
b19d4d8b JR |
583 | diff -Nur XFree86-4.0.2.org/xc/programs/xterm/xterm.h XFree86-4.0.2/xc/programs/xterm/xterm.h |
584 | --- XFree86-4.0.2.org/xc/programs/xterm/xterm.h Sat Dec 9 05:02:44 2000 | |
585 | +++ XFree86-4.0.2/xc/programs/xterm/xterm.h Wed Dec 20 13:41:03 2000 | |
e1fe05b9 JR |
586 | @@ -62,7 +62,7 @@ |
587 | #endif | |
588 | ||
589 | #ifndef DFT_TERMTYPE | |
590 | -#define DFT_TERMTYPE "xterm" | |
591 | +#define DFT_TERMTYPE "xterm-color" | |
592 | #endif | |
593 | ||
594 | #ifndef X_NOT_POSIX | |
54408bbb JR |
595 | --- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile~ Thu Dec 14 20:47:46 2000 |
596 | +++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Dec 22 17:58:27 2000 | |
597 | @@ -92,7 +92,7 @@ | |
598 | ||
599 | #if HasNCurses | |
600 | CURSESLIB = NCursesLibName | |
601 | -CURSESDEFINES = -DHAS_NCURSES | |
602 | +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses | |
603 | #endif | |
604 | ||
605 | DEFINES = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \ |