[packages/XFree86.git] / XFree86-PLD.patch

diff -urN xc.orig/Makefile xc/Makefile
--- xc.orig/Makefile	Mon Dec 30 15:54:17 2002
+++ xc/Makefile	Mon Dec 30 16:02:13 2002
@@ -8,7 +8,7 @@
 # or add "MAKE = make" to this file.
 
 RELEASE = "Release 6.6"
-SHELL = /bin/sh
+SHELL = /bin/sh -e
 RM = rm -f
 MV = mv
 WORLDOPTS =
diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
--- xc.orig/config/cf/Imake.cf	Mon Dec 30 15:52:30 2002
+++ xc/config/cf/Imake.cf	Mon Dec 30 16:02:13 2002
@@ -723,6 +723,10 @@
 #   define s390Architecture
 #  undef __s390__
 # endif /* s390 */
+# ifdef alpha
+#  define AlphaArchitecture
+#  undef alpha
+# endif /* alpha */
 # ifdef __alpha
 #  define AlphaArchitecture
 #  undef __alpha
diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
--- xc.orig/config/cf/Imake.tmpl	Mon Dec 30 15:52:30 2002
+++ xc/config/cf/Imake.tmpl	Mon Dec 30 16:02:13 2002
@@ -253,7 +253,7 @@
 
 #ifndef BuildHtmlManPages
 #ifdef RmanCmd
-#define BuildHtmlManPages YES
+#define BuildHtmlManPages NO
 #else
 #define BuildHtmlManPages NO
 #endif
@@ -833,11 +833,7 @@
 #define LintlibDir $(USRLIBDIR)/lint
 #endif
 #ifndef SystemManDirectory
-#if SystemV4
 #define SystemManDirectory /usr/share/man
-#else
-#define SystemManDirectory /usr/man
-#endif
 #endif
 #ifndef ManDirectoryRoot
 #ifdef ProjectRoot
@@ -974,7 +970,7 @@
 #define NoRConst NO /* YES if const for structs of funcs is bad */
 #endif
 #ifndef InstPgmFlags
-#define InstPgmFlags -s
+#define InstPgmFlags
 #endif
 #ifndef InstBinFlags
 #define InstBinFlags -m 0755
@@ -1112,7 +1108,7 @@
 #define CppCmd /LibDirName/cpp
 #endif
 #ifndef RawCppCmd
-#define RawCppCmd CppCmd -undef
+#define RawCppCmd CppCmd
 #endif
 #ifndef CppNoLineInfoOption
 #define CppNoLineInfoOption /**/
diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
--- xc.orig/config/cf/X11.tmpl	Mon Dec 30 15:52:30 2002
+++ xc/config/cf/X11.tmpl	Mon Dec 30 16:02:13 2002
@@ -1256,8 +1256,12 @@
 # define UsbMouseSupport NO
 #endif
 
+#ifndef EtcX11Directory
+#define EtcX11Directory /etc/X11
+#endif
+
 #ifndef DefaultFSConfigFile
-#define DefaultFSConfigFile $(LIBDIR)/fs/config
+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
 #endif
 
 /* X-TrueType settings */
@@ -1380,7 +1384,7 @@
 #define ConfigDir $(LIBDIR)/config
 #endif
 #ifndef DocDir
-#define DocDir $(LIBDIR)/doc
+#define DocDir $(LIBDIR)/share/doc
 #endif
 #ifndef DocHtmlDir
 #define DocHtmlDir $(DOCDIR)/html
@@ -1389,31 +1393,31 @@
 #define DocPsDir $(DOCDIR)/PostScript
 #endif
 #ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
+#define FontDir /usr/share/fonts
 #endif
 #ifndef AdmDir
-#define AdmDir /usr/adm
+#define AdmDir /var/log
 #endif
 #ifndef XinitDir
-#define XinitDir $(LIBDIR)/xinit
+#define XinitDir $(ETCX11DIR)/xinit
 #endif
 #ifndef XdmDir
-#define XdmDir $(LIBDIR)/xdm
+#define XdmDir $(ETCX11DIR)/xdm
 #endif
 #ifndef XdmVarDir
 #define XdmVarDir $(VARLIBDIR)/xdm
 #endif
 #ifndef XdmAuthDir
-#define XdmAuthDir $(LIBDIR)/xdm
+#define XdmAuthDir $(ETCX11DIR)/xdm
 #endif
 #ifndef XdmConfigurationSubdirectory		/* under xdm sources */
 #define XdmConfigurationSubdirectory config
 #endif
 #ifndef TwmDir
-#define TwmDir $(LIBDIR)/twm
+#define TwmDir $(ETCX11DIR)/twm
 #endif
 #ifndef XsmDir
-#define XsmDir $(LIBDIR)/xsm
+#define XsmDir $(ETCX11DIR)/xsm
 #endif
 #ifndef NlsDir
 #define NlsDir $(LIBDIR)/nls
@@ -1425,23 +1429,20 @@
 #define PexApiDir $(LIBDIR)/PEX
 #endif
 #ifndef LbxproxyDir
-#define LbxproxyDir $(LIBDIR)/lbxproxy
+#define LbxproxyDir $(ETCX11DIR)/lbxproxy
 #endif
 #ifndef LbxproxyConfigSubdir		/* under lbxproxy sources */
 #define LbxproxyConfigSubdir config
 #endif
 #ifndef ProxyManagerDir
-#define ProxyManagerDir $(LIBDIR)/proxymngr
+#define ProxyManagerDir $(ETCX11DIR)/proxymngr
 #endif
 #ifndef ServerConfigDir
-#define ServerConfigDir $(LIBDIR)/xserver
+#define ServerConfigDir $(ETCX11DIR)/xserver
 #endif
 #ifndef XPrintDir
 #define XPrintDir ServerConfigDir
 #endif
-#ifndef EtcX11Directory
-#define EtcX11Directory /etc/X11
-#endif
 #ifndef InstallSecurityConfig
 #define InstallSecurityConfig YES	/* Install sample security policy */
 #endif
@@ -1473,10 +1474,10 @@
 #define OsNameDefines /* as nothing */
 #endif
 #ifndef DefaultUserPath			/* for xdm */
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
 #endif
 #ifndef DefaultSystemPath		/* for xdm */
-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
 #endif
 #ifndef DefaultSystemShell		/* for xdm to set in SHELL */
 #define DefaultSystemShell BourneShell
@@ -1603,7 +1604,7 @@
 
      HTMLINDEXCMD = HtmlIndexCmd
 
-       DOCUTILSRC = $(XTOP)/doc/util
+       DOCUTILSRC = $(XTOP)/share/doc/util
         CLIENTSRC = $(TOP)/clients
           DEMOSRC = $(TOP)/demos
        XDOCMACROS = $(DOCUTILSRC)/macros.t
@@ -1617,7 +1618,7 @@
         SERVERSRC = $(XTOP)/programs/Xserver
        CONTRIBSRC = ContribDir
    UNSUPPORTEDSRC = UnsupportedDir
-           DOCSRC = $(XTOP)/doc
+           DOCSRC = $(XTOP)/share/doc
            RGBSRC = $(XTOP)/programs/rgb
       BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
      MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
--- xc.orig/config/cf/linux.cf	Mon Dec 30 15:52:31 2002
+++ xc/config/cf/linux.cf	Mon Dec 30 16:20:00 2002
@@ -320,7 +320,7 @@
  */
 #if BuildXF86DRI
 # if defined(i386Architecture)
-#  define BuildLibGlxWithoutPIC	YES
+#  define BuildLibGlxWithoutPIC	NO
 # endif
 #endif
 
@@ -333,7 +333,7 @@
 #  if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(x86_64Architecture)
 #    if OSMajorVersion == 2
        /* Only tested for Linux 2.2.0 through 2.2.12 */
-#      if OSMinorVersion == 2 && OSTeenyVersion <= 12
+#      if OSMinorVersion == 2
 #        define BuildXF86DRM	YES
 #      else
          /* Only tested for Linux 2.3.0 through 2.3.18 */
@@ -721,7 +721,7 @@
 
 #define HasVarRun		YES
 #ifndef VarDbDirectory
-# define VarDbDirectory		$(VARDIR)/lib
+# define VarDbDirectory		/var/lib
 #endif
 
 #ifndef XF86OSCardDrivers
diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
--- xc.orig/config/cf/site.def	Mon Dec 30 15:52:31 2002
+++ xc/config/cf/site.def	Mon Dec 30 16:02:13 2002
@@ -119,10 +119,14 @@
 #define HasSentinel	YES
 */
 
-/*
 #undef DefaultUserPath
-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
-*/
+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
+#undef DefaultSystemPath
+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
+
+
+#define HasPam    YES
+#define HasPamMisc    YES
 
 
 /* You do NOT need SetUID if you only run the server under xdm */
diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
--- xc.orig/config/cf/xf86site.def	Mon Dec 30 15:52:31 2002
+++ xc/config/cf/xf86site.def	Mon Dec 30 16:28:24 2002
@@ -234,8 +234,8 @@
 /*
  * To not build/install the Cyrillic fonts, uncomment the following
  *
-#define BuildCyrillicFonts	NO
  */
+#define BuildCyrillicFonts	YES
 
 /*
  * To not install the local font directory, uncomment the following
@@ -281,27 +281,26 @@
  * HasGlide2 to YES and set the Glide2IncDir variable. 
  * HasGlide2 is per default NO.
  *
-#define HasGlide2 YES
  */
+#define HasGlide2 YES
 
 /*
  * Set the path to your Glide include files.
  *
-#define Glide2IncDir /usr/include/glide
  */
+#define Glide2IncDir /usr/include/glide
 
 /* 
  * Have glide 3?
  *
-#define HasGlide3 YES
  */
+#define HasGlide3 YES
 
 /*
  * Set the path to your Glide 3 include files.
  *
-#define Glide3IncDir /usr/include/glide3
  */
-
+#define Glide3IncDir /usr/include/glide3
 
 
 /*
@@ -403,8 +402,8 @@
  * Some Linux releases don't have a libtermcap.  In this case you may need
  * to uncomment the following
  *
-#define TermcapLibrary		-lncurses
  */
+#define TermcapLibrary		-lncurses
 
 /*
  * If you have Tk (which is required to build XF86Setup), uncomment this
@@ -677,8 +676,8 @@
  * To forceably build static libraries in addition to shared libraries,
  * uncomment this.
  *
-#define ForceNormalLib		YES
  */
+#define ForceNormalLib		YES
 
 /*
  * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
--- xc.orig/config/cf/xfree86.cf	Mon Dec 30 15:52:31 2002
+++ xc/config/cf/xfree86.cf	Mon Dec 30 16:02:13 2002
@@ -107,7 +107,7 @@
 #define XConfigFile		XF86Config
 #endif
 #ifndef XConfigDir
-#define XConfigDir		$(LIBDIR)
+#define XConfigDir		$(ETCX11DIR)
 #endif
 #ifndef XLogFile
 #define XLogFile		XFree86
@@ -877,7 +877,7 @@
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
 #  define XF86CardDrivers	ati mga glint s3 s3virge sis savage\
-				trident chips tdfx fbdev \
+				trident chips fbdev \
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c	Mon Dec 30 15:52:31 2002
+++ xc/config/imake/imake.c	Mon Dec 30 16:02:13 2002
@@ -1057,6 +1057,7 @@
   static char* suse = "/etc/SuSE-release";
   static char* redhat = "/etc/redhat-release";
   static char* debian = "/etc/debian_version";
+  static char* pld = "/etc/pld-release";
 
   fprintf (inFile, "%s\n", "#define LinuxUnknown    0");
   fprintf (inFile, "%s\n", "#define LinuxSuSE       1");
@@ -1071,6 +1072,7 @@
   fprintf (inFile, "%s\n", "#define LinuxTurbo      10");
   fprintf (inFile, "%s\n", "#define LinuxWare       11");
   fprintf (inFile, "%s\n", "#define LinuxYggdrasil  12");
+  fprintf (inFile, "%s\n", "#define LinuxPLD        13");
 
 #ifdef CROSSCOMPILE
   if (CrossCompiling) {
@@ -1097,6 +1099,11 @@
      * at the content of /etc/debian_version */
     return;
   }
+  if (lstat (pld, &sb) == 0) {
+    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
+    fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
+    return;
+  }
   /* what's the definitive way to tell what any particular distribution is? */
 
   fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Mon Dec 30 15:53:56 2002
+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Mon Dec 30 16:02:13 2002
@@ -93,7 +93,7 @@
 
 #if HasNCurses
 CURSESLIB = NCursesLibName
-CURSESDEFINES  = -DHAS_NCURSES
+CURSESDEFINES  = -DHAS_NCURSES -I/usr/include/ncurses
 #endif
 
 XF86CONFIGFILE = XConfigFile
diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
--- xc.orig/programs/xdm/config/Xres.cpp	Mon Dec 30 15:54:07 2002
+++ xc/programs/xdm/config/Xres.cpp	Mon Dec 30 16:02:13 2002
@@ -70,10 +70,10 @@
 #endif /* XPM */
 /**/#endif
 #ifdef XPM
-/**/#if PLANES >= 8
-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
+/**/#if PLANES >= 15
+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm
 /**/#else
-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
+xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm
 /**/#endif
 xlogin*useShape: true
 xlogin*logoPadding: 10
diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
--- xc.orig/programs/xdm/resource.c	Mon Dec 30 15:54:06 2002
+++ xc/programs/xdm/resource.c	Mon Dec 30 16:02:13 2002
@@ -73,31 +73,31 @@
  * if it is server-specific).  DO NOT CHANGE THESE DEFINITIONS!
  */
 #ifndef DEF_SERVER_LINE 
-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
 #endif
 #ifndef XRDB_PROGRAM
-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
 #endif
 #ifndef DEF_SESSION
-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
 #endif
 #ifndef DEF_USER_PATH
-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
 #endif
 #ifndef DEF_SYSTEM_PATH
-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
 #endif
 #ifndef DEF_SYSTEM_SHELL
 #define DEF_SYSTEM_SHELL "/bin/sh"
 #endif
 #ifndef DEF_FAILSAFE_CLIENT
-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
 #endif
 #ifndef DEF_XDM_CONFIG
-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
 #endif
 #ifndef DEF_CHOOSER
-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
 #endif
 #ifndef DEF_AUTH_NAME
 #ifdef HASXDMAUTH
@@ -107,7 +107,7 @@
 #endif
 #endif
 #ifndef DEF_AUTH_DIR
-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
+#define DEF_AUTH_DIR "/etc/X11/xdm"
 #endif
 #ifndef DEF_USER_AUTH_DIR
 #define DEF_USER_AUTH_DIR	"/tmp"
diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
--- xc.orig/programs/xinit/Imakefile	Mon Dec 30 15:54:10 2002
+++ xc/programs/xinit/Imakefile	Mon Dec 30 16:31:27 2002
@@ -39,11 +39,12 @@
 InstallNamedProg(startx,startx,$(BINDIR))
 InstallManPage(startx,$(MANDIR))
 
-#if InstallXinitConfig
-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
-#else
-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
-#endif
+XCOMM Red Hat gets this from a different package
+XCOMM #if InstallXinitConfig
+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
+XCOMM #else
+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
+XCOMM #endif
 
 LinkConfDirectory(xinit,.,xinit,.)
 
diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
--- xc.orig/programs/xterm/Imakefile	Mon Dec 30 15:54:16 2002
+++ xc/programs/xterm/Imakefile	Mon Dec 30 16:35:55 2002
@@ -36,6 +36,10 @@
 #define XkbClientLibs /**/
 #endif
 
+#if InstallXtermSetUID
+#undef InstallXtermSetUID
+#endif
+
 #ifndef SpecialCObjectRule
 #define SpecialCObjectRule(module,ignore,defines) \
 module.o: ; $(CC) -c defines $(CFLAGS) module.c
@@ -57,6 +61,8 @@
          PTYLIB = -lpucc
 #endif
 
+         PTYLIB = -lutil
+
 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
     (defined(LinuxArchitecture) && \
      (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
@@ -110,7 +116,7 @@
    MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
     XKB_DEFINES = XkbClientDefines
    PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
-        DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
+        DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
        INCLUDES = $(XRFINCLUDES)
 
 #ifdef OS2Architecture
diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
--- xc.orig/programs/xterm/xterm.h	Mon Dec 30 15:54:16 2002
+++ xc/programs/xterm/xterm.h	Mon Dec 30 16:02:13 2002
@@ -73,7 +73,7 @@
 #endif
 
 #ifndef DFT_TERMTYPE
-#define DFT_TERMTYPE "xterm"
+#define DFT_TERMTYPE "xterm-color"
 #endif
 
 #ifndef X_NOT_POSIX
Commit	Line	Data
2452d5b7	1	diff -urN xc.orig/Makefile xc/Makefile
	2	--- xc.orig/Makefile Mon Dec 30 15:54:17 2002
	3	+++ xc/Makefile Mon Dec 30 16:02:13 2002
bf7d3e51	4	@@ -8,7 +8,7 @@
e1fe05b9 JR	5	# or add "MAKE = make" to this file.
e1fe05b9 JR	6
ea1f593a	7	RELEASE = "Release 6.6"
e1fe05b9 JR	8	-SHELL = /bin/sh
	9	+SHELL = /bin/sh -e
	10	RM = rm -f
	11	MV = mv
bf7d3e51	12	WORLDOPTS =
2452d5b7	13	diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
	14	--- xc.orig/config/cf/Imake.cf Mon Dec 30 15:52:30 2002
	15	+++ xc/config/cf/Imake.cf Mon Dec 30 16:02:13 2002
	16	@@ -723,6 +723,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
2452d5b7	27	diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
	28	--- xc.orig/config/cf/Imake.tmpl Mon Dec 30 15:52:30 2002
	29	+++ xc/config/cf/Imake.tmpl Mon Dec 30 16:02:13 2002
	30	@@ -253,7 +253,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
2452d5b7	39	@@ -833,11 +833,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
2452d5b7	51	@@ -974,7 +970,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
2452d5b7	60	@@ -1112,7 +1108,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 /**/
2452d5b7	69	diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
	70	--- xc.orig/config/cf/X11.tmpl Mon Dec 30 15:52:30 2002
	71	+++ xc/config/cf/X11.tmpl Mon Dec 30 16:02:13 2002
	72	@@ -1256,8 +1256,12 @@
	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 */
2452d5b7	86	@@ -1380,7 +1384,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
2452d5b7	95	@@ -1389,31 +1393,31 @@
e1fe05b9 JR	96	#define DocPsDir $(DOCDIR)/PostScript
	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
2452d5b7	134	@@ -1425,23 +1429,20 @@
e1fe05b9 JR	135	#define PexApiDir $(LIBDIR)/PEX
	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
2452d5b7	161	@@ -1473,10 +1474,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
2452d5b7	174	@@ -1603,7 +1604,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
2452d5b7	183	@@ -1617,7 +1618,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
2452d5b7	192	diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
	193	--- xc.orig/config/cf/linux.cf Mon Dec 30 15:52:31 2002
	194	+++ xc/config/cf/linux.cf Mon Dec 30 16:20:00 2002
	195	@@ -320,7 +320,7 @@
31df3500 JR	196	*/
31df3500 JR	197	#if BuildXF86DRI
ea1f593a	198	# if defined(i386Architecture)
31df3500 JR	199	-# define BuildLibGlxWithoutPIC YES
31df3500 JR	200	+# define BuildLibGlxWithoutPIC NO
ea1f593a	201	# endif
31df3500 JR	202	#endif
31df3500 JR	203
2452d5b7	204	@@ -333,7 +333,7 @@
2452d5b7	205	# if defined(i386Architecture) \|\| defined(ia64Architecture) \|\| defined(SparcArchitecture) \|\| defined(AlphaArchitecture) \|\| defined(x86_64Architecture)
e1fe05b9 JR	206	# if OSMajorVersion == 2
	207	/* Only tested for Linux 2.2.0 through 2.2.12 */
	208	-# if OSMinorVersion == 2 && OSTeenyVersion <= 12
	209	+# if OSMinorVersion == 2
b19d4d8b	210	# define BuildXF86DRM YES
e1fe05b9 JR	211	# else
e1fe05b9 JR	212	/* Only tested for Linux 2.3.0 through 2.3.18 */
2452d5b7	213	@@ -721,7 +721,7 @@
e1fe05b9 JR	214
e1fe05b9 JR	215	#define HasVarRun YES
2452d5b7	216	#ifndef VarDbDirectory
	217	-# define VarDbDirectory $(VARDIR)/lib
	218	+# define VarDbDirectory /var/lib
	219	#endif
e1fe05b9 JR	220
e1fe05b9 JR	221	#ifndef XF86OSCardDrivers
2452d5b7	222	diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def
	223	--- xc.orig/config/cf/site.def Mon Dec 30 15:52:31 2002
	224	+++ xc/config/cf/site.def Mon Dec 30 16:02:13 2002
	225	@@ -119,10 +119,14 @@
e1fe05b9 JR	226	#define HasSentinel YES
	227	*/
	228
	229	-/*
	230	#undef DefaultUserPath
	231	-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
	232	-*/
8a78032e	233	+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
e1fe05b9	234	+#undef DefaultSystemPath
8a78032e	235	+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
e1fe05b9 JR	236	+
	237	+
	238	+#define HasPam YES
54408bbb	239	+#define HasPamMisc YES
e1fe05b9 JR	240
	241
	242	/* You do NOT need SetUID if you only run the server under xdm */
2452d5b7	243	diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
	244	--- xc.orig/config/cf/xf86site.def Mon Dec 30 15:52:31 2002
	245	+++ xc/config/cf/xf86site.def Mon Dec 30 16:28:24 2002
	246	@@ -234,8 +234,8 @@
	247	/*
	248	* To not build/install the Cyrillic fonts, uncomment the following
	249	*
	250	-#define BuildCyrillicFonts NO
	251	*/
	252	+#define BuildCyrillicFonts YES
	253
	254	/*
	255	* To not install the local font directory, uncomment the following
	256	@@ -281,27 +281,26 @@
	257	* HasGlide2 to YES and set the Glide2IncDir variable.
	258	* HasGlide2 is per default NO.
	259	*
	260	-#define HasGlide2 YES
	261	*/
	262	+#define HasGlide2 YES
	263
	264	/*
	265	* Set the path to your Glide include files.
	266	*
	267	-#define Glide2IncDir /usr/include/glide
	268	*/
	269	+#define Glide2IncDir /usr/include/glide
	270
	271	/*
	272	* Have glide 3?
	273	*
	274	-#define HasGlide3 YES
	275	*/
	276	+#define HasGlide3 YES
	277
	278	/*
	279	* Set the path to your Glide 3 include files.
	280	*
	281	-#define Glide3IncDir /usr/include/glide3
	282	*/
	283	-
	284	+#define Glide3IncDir /usr/include/glide3
	285
	286
	287	/*
	288	@@ -403,8 +402,8 @@
e1fe05b9 JR	289	* Some Linux releases don't have a libtermcap. In this case you may need
	290	* to uncomment the following
	291	*
	292	-#define TermcapLibrary -lncurses
	293	*/
	294	+#define TermcapLibrary -lncurses
	295
	296	/*
	297	* If you have Tk (which is required to build XF86Setup), uncomment this
2452d5b7	298	@@ -677,8 +676,8 @@
e1fe05b9 JR	299	* To forceably build static libraries in addition to shared libraries,
	300	* uncomment this.
	301	*
	302	-#define ForceNormalLib YES
	303	*/
	304	+#define ForceNormalLib YES
	305
	306	/*
	307	* Uncomment this if your default tools (eg, gcc, ld, as, etc) are
2452d5b7	308	diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
	309	--- xc.orig/config/cf/xfree86.cf Mon Dec 30 15:52:31 2002
	310	+++ xc/config/cf/xfree86.cf Mon Dec 30 16:02:13 2002
	311	@@ -107,7 +107,7 @@
e1fe05b9 JR	312	#define XConfigFile XF86Config
	313	#endif
	314	#ifndef XConfigDir
	315	-#define XConfigDir $(LIBDIR)
	316	+#define XConfigDir $(ETCX11DIR)
	317	#endif
b19d4d8b JR	318	#ifndef XLogFile
b19d4d8b JR	319	#define XLogFile XFree86
2452d5b7	320	@@ -877,7 +877,7 @@
91e66983	321	/* Pure PCI drivers should go first */
	322	# ifndef XF86CardDrivers
	323	# define XF86CardDrivers ati mga glint s3 s3virge sis savage\
	324	- trident chips tdfx fbdev \
	325	+ trident chips fbdev \
	326	DevelDrivers vga \
	327	XF86OSCardDrivers XF86ExtraCardDrivers
	328	# endif
2452d5b7	329	diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
	330	--- xc.orig/config/imake/imake.c Mon Dec 30 15:52:31 2002
	331	+++ xc/config/imake/imake.c Mon Dec 30 16:02:13 2002
	332	@@ -1057,6 +1057,7 @@
	333	static char* suse = "/etc/SuSE-release";
e1fe05b9 JR	334	static char* redhat = "/etc/redhat-release";
	335	static char* debian = "/etc/debian_version";
	336	+ static char* pld = "/etc/pld-release";
	337
	338	fprintf (inFile, "%s\n", "#define LinuxUnknown 0");
	339	fprintf (inFile, "%s\n", "#define LinuxSuSE 1");
2452d5b7	340	@@ -1071,6 +1072,7 @@
e1fe05b9 JR	341	fprintf (inFile, "%s\n", "#define LinuxTurbo 10");
	342	fprintf (inFile, "%s\n", "#define LinuxWare 11");
	343	fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
	344	+ fprintf (inFile, "%s\n", "#define LinuxPLD 13");
	345
2452d5b7	346	#ifdef CROSSCOMPILE
	347	if (CrossCompiling) {
	348	@@ -1097,6 +1099,11 @@
e1fe05b9	349	* at the content of /etc/debian_version */
2452d5b7	350	return;
2452d5b7	351	}
e1fe05b9 JR	352	+ if (lstat (pld, &sb) == 0) {
	353	+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxPLD");
	354	+ fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD");
2452d5b7	355	+ return;
2452d5b7	356	+ }
e1fe05b9	357	/* what's the definitive way to tell what any particular distribution is? */
2452d5b7	358
2452d5b7	359	fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
2452d5b7	360	diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
	361	--- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 15:53:56 2002
	362	+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 16:02:13 2002
	363	@@ -93,7 +93,7 @@
	364
	365	#if HasNCurses
	366	CURSESLIB = NCursesLibName
	367	-CURSESDEFINES = -DHAS_NCURSES
	368	+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
	369	#endif
	370
	371	XF86CONFIGFILE = XConfigFile
	372	diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
	373	--- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002
	374	+++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 16:02:13 2002
	375	@@ -70,10 +70,10 @@
	376	#endif /* XPM */
e1fe05b9 JR	377	/**/#endif
e1fe05b9 JR	378	#ifdef XPM
fa05ba13	379	-/**/#if PLANES >= 8
e1fe05b9	380	-xloginlogoFileName: BITMAPDIR/*//XDM_PIXMAP
fa05ba13	381	+/**/#if PLANES >= 15
8a78032e	382	+xloginlogoFileName: BITMAPDIR/*//xdm-pld-logo.xpm
e1fe05b9 JR	383	/**/#else
	384	-xloginlogoFileName: BITMAPDIR/*//XDM_BWPIXMAP
	385	+xloginlogoFileName: BITMAPDIR/*//xdm-pld-logo-bw.xpm
	386	/**/#endif
	387	xlogin*useShape: true
	388	xlogin*logoPadding: 10
2452d5b7	389	diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
	390	--- xc.orig/programs/xdm/resource.c Mon Dec 30 15:54:06 2002
	391	+++ xc/programs/xdm/resource.c Mon Dec 30 16:02:13 2002
	392	@@ -73,31 +73,31 @@
	393	* if it is server-specific). DO NOT CHANGE THESE DEFINITIONS!
e1fe05b9	394	*/
e1fe05b9 JR	395	#ifndef DEF_SERVER_LINE
e1fe05b9 JR	396	-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
47559fe6	397	+#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0"
e1fe05b9 JR	398	#endif
	399	#ifndef XRDB_PROGRAM
	400	-#define XRDB_PROGRAM "/usr/bin/X11/xrdb"
47559fe6	401	+#define XRDB_PROGRAM "/usr/X11R6/X11/xrdb"
e1fe05b9 JR	402	#endif
	403	#ifndef DEF_SESSION
	404	-#define DEF_SESSION "/usr/bin/X11/xterm -ls"
47559fe6	405	+#define DEF_SESSION "/usr/X11R6/bin/xterm -ls"
e1fe05b9 JR	406	#endif
	407	#ifndef DEF_USER_PATH
	408	-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6	409	+#define DEF_USER_PATH "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin"
e1fe05b9 JR	410	#endif
	411	#ifndef DEF_SYSTEM_PATH
	412	-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb"
47559fe6	413	+#define DEF_SYSTEM_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin"
e1fe05b9 JR	414	#endif
	415	#ifndef DEF_SYSTEM_SHELL
	416	#define DEF_SYSTEM_SHELL "/bin/sh"
	417	#endif
	418	#ifndef DEF_FAILSAFE_CLIENT
	419	-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm"
47559fe6	420	+#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
e1fe05b9 JR	421	#endif
	422	#ifndef DEF_XDM_CONFIG
	423	-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
	424	+#define DEF_XDM_CONFIG "/etc/X11/xdm/xdm-config"
	425	#endif
	426	#ifndef DEF_CHOOSER
	427	-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser"
	428	+#define DEF_CHOOSER "/etc/X11/xdm/chooser"
	429	#endif
	430	#ifndef DEF_AUTH_NAME
	431	#ifdef HASXDMAUTH
2452d5b7	432	@@ -107,7 +107,7 @@
e1fe05b9 JR	433	#endif
	434	#endif
	435	#ifndef DEF_AUTH_DIR
	436	-#define DEF_AUTH_DIR "/usr/lib/X11/xdm"
	437	+#define DEF_AUTH_DIR "/etc/X11/xdm"
	438	#endif
	439	#ifndef DEF_USER_AUTH_DIR
	440	#define DEF_USER_AUTH_DIR "/tmp"
2452d5b7	441	diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
	442	--- xc.orig/programs/xinit/Imakefile Mon Dec 30 15:54:10 2002
	443	+++ xc/programs/xinit/Imakefile Mon Dec 30 16:31:27 2002
	444	@@ -39,11 +39,12 @@
e1fe05b9 JR	445	InstallNamedProg(startx,startx,$(BINDIR))
	446	InstallManPage(startx,$(MANDIR))
	447
	448	-#if InstallXinitConfig
	449	-InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
	450	-#else
	451	-InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
	452	-#endif
	453	+XCOMM Red Hat gets this from a different package
	454	+XCOMM #if InstallXinitConfig
	455	+XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
	456	+XCOMM #else
	457	+XCOMM InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
	458	+XCOMM #endif
e1fe05b9 JR	459
e1fe05b9 JR	460	LinkConfDirectory(xinit,.,xinit,.)
2452d5b7	461
	462	diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
	463	--- xc.orig/programs/xterm/Imakefile Mon Dec 30 15:54:16 2002
	464	+++ xc/programs/xterm/Imakefile Mon Dec 30 16:35:55 2002
e1fe05b9 JR	465	@@ -36,6 +36,10 @@
	466	#define XkbClientLibs /**/
	467	#endif
	468
	469	+#if InstallXtermSetUID
	470	+#undef InstallXtermSetUID
	471	+#endif
	472	+
	473	#ifndef SpecialCObjectRule
	474	#define SpecialCObjectRule(module,ignore,defines) \
	475	module.o: ; $(CC) -c defines $(CFLAGS) module.c
	476	@@ -57,6 +61,8 @@
	477	PTYLIB = -lpucc
	478	#endif
	479
	480	+ PTYLIB = -lutil
	481	+
2452d5b7	482	#if defined(NetBSDArchitecture) \|\| defined(OpenBSDArchitecture) \|\| \
	483	(defined(LinuxArchitecture) && \
	484	(LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1))
	485	@@ -110,7 +116,7 @@
e1fe05b9 JR	486	MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
e1fe05b9 JR	487	XKB_DEFINES = XkbClientDefines
2452d5b7	488	PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
	489	- DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
	490	+ DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
	491	INCLUDES = $(XRFINCLUDES)
e1fe05b9 JR	492
e1fe05b9 JR	493	#ifdef OS2Architecture
2452d5b7	494	diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
	495	--- xc.orig/programs/xterm/xterm.h Mon Dec 30 15:54:16 2002
	496	+++ xc/programs/xterm/xterm.h Mon Dec 30 16:02:13 2002
	497	@@ -73,7 +73,7 @@
e1fe05b9 JR	498	#endif
	499
	500	#ifndef DFT_TERMTYPE
	501	-#define DFT_TERMTYPE "xterm"
	502	+#define DFT_TERMTYPE "xterm-color"
	503	#endif
	504
	505	#ifndef X_NOT_POSIX