]>
Commit | Line | Data |
---|---|---|
db36d1df AM |
1 | diff -ur X11-6.9.0.org/xc/config/cf/Imake.cf X11-6.9.0/xc/config/cf/Imake.cf |
2 | --- X11-6.9.0.org/xc/config/cf/Imake.cf 2005-11-08 07:33:24.000000000 +0100 | |
3 | +++ X11-6.9.0/xc/config/cf/Imake.cf 2005-12-22 10:27:11.890963000 +0100 | |
4 | @@ -888,6 +888,10 @@ | |
aa35d5a8 AM |
5 | # define s390Architecture |
6 | # undef __s390__ | |
7 | # endif /* s390 */ | |
8 | +# ifdef alpha | |
9 | +# define AlphaArchitecture | |
10 | +# undef alpha | |
11 | +# endif /* alpha */ | |
12 | # ifdef __alpha | |
13 | # define AlphaArchitecture | |
14 | # undef __alpha | |
db36d1df AM |
15 | diff -ur X11-6.9.0.org/xc/config/cf/Imake.tmpl X11-6.9.0/xc/config/cf/Imake.tmpl |
16 | --- X11-6.9.0.org/xc/config/cf/Imake.tmpl 2005-11-08 07:33:24.000000000 +0100 | |
17 | +++ X11-6.9.0/xc/config/cf/Imake.tmpl 2005-12-22 10:28:07.490963000 +0100 | |
18 | @@ -266,7 +266,7 @@ | |
aa35d5a8 AM |
19 | |
20 | #ifndef BuildHtmlManPages | |
21 | #ifdef RmanCmd | |
22 | -#define BuildHtmlManPages YES | |
23 | +#define BuildHtmlManPages NO | |
24 | #else | |
25 | #define BuildHtmlManPages NO | |
26 | #endif | |
db36d1df | 27 | @@ -882,11 +882,7 @@ |
aa35d5a8 AM |
28 | #define LintlibDir $(USRLIBDIR)/lint |
29 | #endif | |
30 | #ifndef SystemManDirectory | |
31 | -#if SystemV4 | |
32 | #define SystemManDirectory /usr/share/man | |
33 | -#else | |
34 | -#define SystemManDirectory /usr/man | |
35 | -#endif | |
36 | #endif | |
37 | #ifndef ManDirectoryRoot | |
38 | #ifdef ProjectRoot | |
db36d1df | 39 | @@ -1196,7 +1192,7 @@ |
aa35d5a8 AM |
40 | #define CppCmd /LibDirName/cpp |
41 | #endif | |
42 | #ifndef RawCppCmd | |
43 | -#define RawCppCmd CppCmd -undef | |
44 | +#define RawCppCmd CppCmd | |
45 | #endif | |
46 | #ifndef CppNoLineInfoOption | |
47 | #define CppNoLineInfoOption /**/ | |
db36d1df AM |
48 | diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf |
49 | --- X11-6.9.0.org/xc/config/cf/linux.cf 2005-10-21 21:10:27.000000000 +0200 | |
50 | +++ X11-6.9.0/xc/config/cf/linux.cf 2005-12-22 10:40:10.100963000 +0100 | |
51 | @@ -394,7 +394,7 @@ | |
52 | #ifndef BuildLibGlxWithoutPIC | |
53 | # if BuildXF86DRI | |
54 | # if defined(i386Architecture) | |
55 | -# define BuildLibGlxWithoutPIC YES | |
56 | +# define BuildLibGlxWithoutPIC NO | |
57 | # endif | |
756a6f4b AM |
58 | # endif |
59 | #endif | |
db36d1df AM |
60 | @@ -539,6 +539,10 @@ |
61 | # define HasExpat YES | |
62 | #endif | |
756a6f4b | 63 | |
db36d1df AM |
64 | +#ifndef HasFontconfig |
65 | +# define HasFontconfig YES | |
66 | +#endif | |
67 | + | |
68 | #ifndef HasFreetype2 | |
69 | # define HasFreetype2 YES | |
70 | #endif | |
71 | @@ -792,7 +796,7 @@ | |
756a6f4b AM |
72 | |
73 | #define HasVarRun YES | |
74 | #ifndef VarDbDirectory | |
75 | -# define VarDbDirectory $(VARDIR)/lib | |
76 | +# define VarDbDirectory /var/lib | |
77 | #endif | |
78 | ||
79 | #ifndef XF86OSCardDrivers | |
db36d1df AM |
80 | diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def |
81 | --- X11-6.9.0.org/xc/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200 | |
82 | +++ X11-6.9.0/xc/config/cf/site.def 2005-12-22 10:29:12.390963000 +0100 | |
83 | @@ -124,6 +124,14 @@ | |
84 | #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin | |
756a6f4b AM |
85 | */ |
86 | ||
756a6f4b AM |
87 | +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) |
88 | +#undef DefaultSystemPath | |
89 | +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) | |
90 | + | |
91 | + | |
92 | +#define HasPam YES | |
93 | +#define HasPamMisc YES | |
db36d1df | 94 | + |
756a6f4b AM |
95 | |
96 | /* You do NOT need SetUID if you only run the server under xdm */ | |
db36d1df AM |
97 | /* You MAY need SetUID if users run the server by hand or under xinit */ |
98 | diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl | |
99 | --- X11-6.9.0.org/xc/config/cf/X11.tmpl 2005-12-15 00:41:52.000000000 +0100 | |
100 | +++ X11-6.9.0/xc/config/cf/X11.tmpl 2005-12-22 10:32:25.830963000 +0100 | |
51d35eb3 AM |
101 | @@ -597,7 +597,7 @@ |
102 | #define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly) | |
103 | #endif | |
104 | #ifndef BuildDPSLibraries | |
105 | -#define BuildDPSLibraries NO | |
106 | +#define BuildDPSLibraries YES | |
107 | #endif | |
108 | #ifndef BuildDPSLibrary | |
109 | #define BuildDPSLibrary BuildDPSLibraries | |
110 | @@ -693,7 +693,7 @@ | |
111 | #endif | |
112 | ||
113 | #ifndef BuildXterm | |
114 | -#define BuildXterm NO | |
115 | +#define BuildXterm YES | |
116 | #endif | |
117 | ||
118 | #ifndef BuildXkbcomp | |
db36d1df | 119 | @@ -731,7 +731,7 @@ |
756a6f4b | 120 | #endif |
db36d1df | 121 | |
756a6f4b AM |
122 | #ifndef InstallHardcopyDocs |
123 | -#define InstallHardcopyDocs YES | |
124 | +#define InstallHardcopyDocs NO | |
125 | #endif | |
db36d1df | 126 | |
756a6f4b | 127 | #ifndef InstallMiscManPages |
db36d1df | 128 | @@ -1395,8 +1395,12 @@ |
aa35d5a8 AM |
129 | # define UsbMouseSupport NO |
130 | #endif | |
131 | ||
132 | +#ifndef EtcX11Directory | |
133 | +#define EtcX11Directory /etc/X11 | |
134 | +#endif | |
135 | + | |
136 | #ifndef DefaultFSConfigFile | |
137 | -#define DefaultFSConfigFile $(LIBDIR)/fs/config | |
138 | +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config | |
139 | #endif | |
140 | ||
756a6f4b | 141 | #ifndef BinDir |
db36d1df | 142 | @@ -1483,7 +1487,7 @@ |
aa35d5a8 AM |
143 | #define ConfigDir $(LIBDIR)/config |
144 | #endif | |
145 | #ifndef DocDir | |
146 | -#define DocDir $(LIBDIR)/doc | |
147 | +#define DocDir $(LIBDIR)/share/doc | |
148 | #endif | |
149 | #ifndef DocHtmlDir | |
150 | #define DocHtmlDir $(DOCDIR)/html | |
db36d1df | 151 | @@ -1495,34 +1499,34 @@ |
aa35d5a8 AM |
152 | #define DocPdfDir $(DOCDIR)/PDF |
153 | #endif | |
154 | #ifndef FontDir | |
155 | -#define FontDir $(LIBDIR)/fonts | |
156 | +#define FontDir /usr/share/fonts | |
db36d1df AM |
157 | #endif |
158 | #ifndef FontEncDir | |
105ecf5b AM |
159 | -#define FontEncDir $(LIBDIR)/fonts/encodings |
160 | +#define FontEncDir /usr/share/fonts/encodings | |
aa35d5a8 AM |
161 | #endif |
162 | #ifndef AdmDir | |
163 | -#define AdmDir /usr/adm | |
164 | +#define AdmDir /var/log | |
165 | #endif | |
166 | #ifndef XinitDir | |
167 | -#define XinitDir $(LIBDIR)/xinit | |
168 | +#define XinitDir $(ETCX11DIR)/xinit | |
169 | #endif | |
170 | #ifndef XdmDir | |
171 | -#define XdmDir $(LIBDIR)/xdm | |
172 | +#define XdmDir $(ETCX11DIR)/xdm | |
173 | #endif | |
174 | #ifndef XdmVarDir | |
175 | #define XdmVarDir $(VARLIBDIR)/xdm | |
176 | #endif | |
177 | #ifndef XdmAuthDir | |
178 | -#define XdmAuthDir $(LIBDIR)/xdm | |
179 | +#define XdmAuthDir $(ETCX11DIR)/xdm | |
180 | #endif | |
181 | #ifndef XdmConfigurationSubdirectory /* under xdm sources */ | |
182 | #define XdmConfigurationSubdirectory config | |
183 | #endif | |
184 | #ifndef TwmDir | |
185 | -#define TwmDir $(LIBDIR)/twm | |
186 | +#define TwmDir $(ETCX11DIR)/twm | |
187 | #endif | |
188 | #ifndef XsmDir | |
189 | -#define XsmDir $(LIBDIR)/xsm | |
190 | +#define XsmDir $(ETCX11DIR)/xsm | |
191 | #endif | |
192 | #ifndef NlsDir | |
193 | #define NlsDir $(LIBDIR)/nls | |
756a6f4b | 194 | @@ -1531,23 +1535,20 @@ |
aa35d5a8 AM |
195 | #define XLocaleDir $(LIBDIR)/locale |
196 | #endif | |
197 | #ifndef LbxproxyDir | |
198 | -#define LbxproxyDir $(LIBDIR)/lbxproxy | |
199 | +#define LbxproxyDir $(ETCX11DIR)/lbxproxy | |
200 | #endif | |
201 | #ifndef LbxproxyConfigSubdir /* under lbxproxy sources */ | |
202 | #define LbxproxyConfigSubdir config | |
203 | #endif | |
204 | #ifndef ProxyManagerDir | |
205 | -#define ProxyManagerDir $(LIBDIR)/proxymngr | |
206 | +#define ProxyManagerDir $(ETCX11DIR)/proxymngr | |
207 | #endif | |
208 | #ifndef ServerConfigDir | |
209 | -#define ServerConfigDir $(LIBDIR)/xserver | |
210 | +#define ServerConfigDir $(ETCX11DIR)/xserver | |
211 | #endif | |
212 | #ifndef XPrintDir | |
213 | #define XPrintDir ServerConfigDir | |
214 | #endif | |
215 | -#ifndef EtcX11Directory | |
216 | -#define EtcX11Directory /etc/X11 | |
217 | -#endif | |
218 | #ifndef InstallSecurityConfig | |
219 | #define InstallSecurityConfig YES /* Install sample security policy */ | |
220 | #endif | |
756a6f4b | 221 | @@ -1579,10 +1580,10 @@ |
aa35d5a8 AM |
222 | #define OsNameDefines /* as nothing */ |
223 | #endif | |
224 | #ifndef DefaultUserPath /* for xdm */ | |
225 | -#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb | |
226 | +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) | |
227 | #endif | |
228 | #ifndef DefaultSystemPath /* for xdm */ | |
229 | -#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb | |
230 | +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) | |
231 | #endif | |
232 | #ifndef DefaultSystemShell /* for xdm to set in SHELL */ | |
233 | #define DefaultSystemShell BourneShell | |
756a6f4b | 234 | @@ -1719,7 +1720,7 @@ |
aa35d5a8 AM |
235 | |
236 | HTMLINDEXCMD = HtmlIndexCmd | |
237 | ||
238 | - DOCUTILSRC = $(XTOP)/doc/util | |
239 | + DOCUTILSRC = $(XTOP)/share/doc/util | |
240 | CLIENTSRC = $(TOP)/clients | |
241 | DEMOSRC = $(TOP)/demos | |
242 | XDOCMACROS = $(DOCUTILSRC)/macros.t | |
756a6f4b | 243 | @@ -1733,7 +1734,7 @@ |
aa35d5a8 AM |
244 | SERVERSRC = $(XTOP)/programs/Xserver |
245 | CONTRIBSRC = ContribDir | |
246 | UNSUPPORTEDSRC = UnsupportedDir | |
247 | - DOCSRC = $(XTOP)/doc | |
248 | + DOCSRC = $(XTOP)/share/doc | |
249 | RGBSRC = $(XTOP)/programs/rgb | |
250 | BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf | |
251 | MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir | |
db36d1df AM |
252 | diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf |
253 | --- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200 | |
254 | +++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100 | |
255 | @@ -136,7 +136,7 @@ | |
756a6f4b | 256 | #define XConfigFile xorg.conf |
aa35d5a8 | 257 | #endif |
756a6f4b AM |
258 | #ifndef XConfigDir |
259 | -#define XConfigDir $(LIBDIR) | |
db36d1df | 260 | +#define XConfigDir $(ETCX11DIR) |
aa35d5a8 | 261 | #endif |
756a6f4b AM |
262 | #ifndef XLogFile |
263 | #define XLogFile Xorg | |
db36d1df | 264 | @@ -408,7 +408,7 @@ |
756a6f4b AM |
265 | neomagic i740 tdfx savage \ |
266 | cirrus vmware tseng trident chips apm \ | |
267 | GlideDriver i128 i386Drivers \ | |
268 | - ati DevelDrivers ark \ | |
269 | + ati DevelDrivers ark fbdev \ | |
270 | cyrix siliconmotion via \ | |
271 | vesa vga \ | |
272 | dummy XF86OSCardDrivers XF86ExtraCardDrivers | |
db36d1df AM |
273 | diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def |
274 | --- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200 | |
275 | +++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100 | |
276 | @@ -266,8 +266,8 @@ | |
aa35d5a8 AM |
277 | /* |
278 | * To not build/install the Cyrillic fonts, uncomment the following | |
279 | * | |
280 | -#define BuildCyrillicFonts NO | |
281 | */ | |
282 | +#define BuildCyrillicFonts YES | |
283 | ||
284 | /* | |
285 | * To not install the local font directory, uncomment the following | |
db36d1df | 286 | @@ -435,8 +435,8 @@ |
aa35d5a8 AM |
287 | * Some Linux releases don't have a libtermcap. In this case you may need |
288 | * to uncomment the following | |
289 | * | |
290 | -#define TermcapLibrary -lncurses | |
291 | */ | |
292 | +#define TermcapLibrary -lncurses | |
293 | ||
294 | /* | |
295 | * Build a server that dynamically loads the modules by setting | |
756a6f4b | 296 | @@ -610,8 +610,8 @@ |
aa35d5a8 AM |
297 | * To forceably build static libraries in addition to shared libraries, |
298 | * uncomment this. | |
299 | * | |
300 | -#define ForceNormalLib YES | |
301 | */ | |
302 | +#define ForceNormalLib YES | |
303 | ||
304 | /* | |
305 | * Uncomment this if your default tools (eg, gcc, ld, as, etc) are | |
db36d1df AM |
306 | diff -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c |
307 | --- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100 | |
308 | +++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100 | |
309 | @@ -1061,6 +1061,7 @@ | |
aa35d5a8 AM |
310 | static char* suse = "/etc/SuSE-release"; |
311 | static char* redhat = "/etc/redhat-release"; | |
312 | static char* debian = "/etc/debian_version"; | |
313 | + static char* pld = "/etc/pld-release"; | |
314 | ||
315 | fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); | |
316 | fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); | |
db36d1df | 317 | @@ -1075,6 +1076,7 @@ |
aa35d5a8 AM |
318 | fprintf (inFile, "%s\n", "#define LinuxTurbo 10"); |
319 | fprintf (inFile, "%s\n", "#define LinuxWare 11"); | |
320 | fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); | |
321 | + fprintf (inFile, "%s\n", "#define LinuxPLD 13"); | |
322 | ||
323 | #ifdef CROSSCOMPILE | |
324 | if (CrossCompiling) { | |
db36d1df | 325 | @@ -1101,6 +1103,12 @@ |
aa35d5a8 AM |
326 | * at the content of /etc/debian_version */ |
327 | return; | |
328 | } | |
329 | + if (lstat (pld, &sb) == 0) { | |
330 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD"); | |
331 | + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD"); | |
332 | + return; | |
333 | + } | |
db36d1df | 334 | + |
aa35d5a8 AM |
335 | /* what's the definitive way to tell what any particular distribution is? */ |
336 | ||
337 | fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); | |
db36d1df AM |
338 | diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile |
339 | --- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100 | |
340 | +++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100 | |
341 | @@ -9,7 +9,7 @@ | |
342 | # or add "MAKE = make" to this file. | |
343 | ||
344 | RELEASE = "Release 6.9" | |
345 | -SHELL = /bin/sh | |
346 | +SHELL = /bin/sh -e | |
347 | RM = rm -f | |
348 | MV = mv | |
349 | WORLDOPTS = | |
350 | diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp | |
351 | --- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200 | |
352 | +++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100 | |
756a6f4b AM |
353 | @@ -70,10 +70,10 @@ |
354 | #endif /* XPM */ | |
aa35d5a8 AM |
355 | XHASHendif |
356 | #ifdef XPM | |
357 | -XHASHif PLANES >= 8 | |
358 | -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP | |
359 | +XHASHif PLANES > 8 | |
360 | +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm | |
361 | XHASHelse | |
362 | -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP | |
363 | +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm | |
364 | XHASHendif | |
365 | xlogin*useShape: true | |
366 | xlogin*logoPadding: 10 | |
db36d1df AM |
367 | diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c |
368 | --- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100 | |
369 | +++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100 | |
756a6f4b | 370 | @@ -85,31 +85,31 @@ |
aa35d5a8 AM |
371 | */ |
372 | #ifndef __EMX__ | |
373 | #ifndef DEF_SERVER_LINE | |
374 | -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0" | |
375 | +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0" | |
376 | #endif | |
377 | #ifndef XRDB_PROGRAM | |
378 | -#define XRDB_PROGRAM "/usr/bin/X11/xrdb" | |
379 | +#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb" | |
380 | #endif | |
381 | #ifndef DEF_SESSION | |
382 | -#define DEF_SESSION "/usr/bin/X11/xterm -ls" | |
383 | +#define DEF_SESSION "/usr/X11R6/bin/xterm -ls" | |
384 | #endif | |
385 | #ifndef DEF_USER_PATH | |
386 | -#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb" | |
387 | +#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin" | |
388 | #endif | |
389 | #ifndef DEF_SYSTEM_PATH | |
390 | -#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb" | |
391 | +#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin" | |
392 | #endif | |
393 | #ifndef DEF_SYSTEM_SHELL | |
394 | #define DEF_SYSTEM_SHELL "/bin/sh" | |
395 | #endif | |
396 | #ifndef DEF_FAILSAFE_CLIENT | |
397 | -#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm" | |
398 | +#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm" | |
399 | #endif | |
400 | #ifndef DEF_XDM_CONFIG | |
401 | -#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config" | |
402 | +#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config" | |
403 | #endif | |
404 | #ifndef DEF_CHOOSER | |
405 | -#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser" | |
406 | +#define DEF_CHOOSER "/etc/X11/xdm/chooser" | |
407 | #endif | |
408 | #ifndef DEF_AUTH_NAME | |
409 | #ifdef HASXDMAUTH | |
756a6f4b | 410 | @@ -119,7 +119,7 @@ |
aa35d5a8 AM |
411 | #endif |
412 | #endif | |
413 | #ifndef DEF_AUTH_DIR | |
414 | -#define DEF_AUTH_DIR "/usr/lib/X11/xdm" | |
415 | +#define DEF_AUTH_DIR "/etc/X11/xdm" | |
416 | #endif | |
417 | #ifndef DEF_USER_AUTH_DIR | |
418 | #define DEF_USER_AUTH_DIR "/tmp" | |
db36d1df AM |
419 | diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile |
420 | --- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100 | |
421 | +++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100 | |
8d876ab9 AM |
422 | @@ -72,7 +72,7 @@ |
423 | ||
424 | MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR)) | |
425 | ||
426 | -MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR)) | |
427 | +MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR)) | |
428 | ||
429 | #if defined(SCOArchitecture) || defined(USLArchitecture) | |
430 | ARCHMANDEFS=-D__SCOMAN__ | |
db36d1df | 431 | @@ -88,11 +88,12 @@ |
aa35d5a8 AM |
432 | #endif |
433 | InstallManPage(startx,$(MANDIR)) | |
434 | ||
435 | -#if InstallXinitConfig | |
436 | -InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
437 | -#else | |
438 | -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
439 | -#endif | |
440 | +XCOMM Red Hat gets this from a different package | |
441 | +XCOMM #if InstallXinitConfig | |
442 | +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) | |
443 | +XCOMM #else | |
444 | +XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) | |
445 | +XCOMM #endif | |
446 | ||
447 | LinkConfDirectory(xinit,.,xinit,.) | |
448 | ||
db36d1df AM |
449 | diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile |
450 | --- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200 | |
451 | +++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100 | |
452 | @@ -110,7 +110,7 @@ | |
453 | ||
454 | #if HasNCurses | |
455 | CURSESLIB = NCursesLibName | |
456 | -CURSESDEFINES = -DHAS_NCURSES | |
457 | +CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses | |
458 | #endif | |
459 | ||
460 | XF86CONFIGFILE = XConfigFile | |
461 | diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile | |
462 | --- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100 | |
463 | +++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100 | |
464 | @@ -68,6 +68,10 @@ | |
465 | # endif | |
aa35d5a8 AM |
466 | #endif |
467 | ||
468 | +#if InstallXtermSetUID | |
469 | +#undef InstallXtermSetUID | |
470 | +#endif | |
471 | + | |
472 | #ifndef SpecialCObjectRule | |
473 | #define SpecialCObjectRule(module,ignore,defines) \ | |
474 | module.o: ; $(CC) -c defines $(CFLAGS) module.c | |
db36d1df AM |
475 | @@ -88,6 +92,7 @@ |
476 | PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ | |
aa35d5a8 AM |
477 | PTYLIB = -lpucc |
478 | #endif | |
db36d1df | 479 | + PTYLIB = -lutil |
aa35d5a8 | 480 | |
db36d1df AM |
481 | #if defined(NetBSDArchitecture) || \ |
482 | defined(OpenBSDArchitecture) || \ | |
483 | @@ -153,7 +158,7 @@ | |
aa35d5a8 AM |
484 | XKB_DEFINES = XkbClientDefines |
485 | PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) | |
db36d1df | 486 | DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) |
aa35d5a8 AM |
487 | - INCLUDES = -I. $(XRFINCLUDES) |
488 | + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES) | |
489 | ||
490 | #ifdef OS2Architecture | |
491 | MAINSRC = os2main.c |