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