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,10 +8,10 @@
+@@ -8,7 +8,7 @@
# or add "MAKE = make" to this file.
RELEASE = "Release 6.6"
+SHELL = /bin/sh -e
RM = rm -f
MV = mv
--WORLDOPTS = -k
-+WORLDOPTS =
- WIN32WORLDOPTS = -i
- TOP = .
- CURRENT_DIR = .
+ 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
#endif
#ifndef XF86OSCardDrivers
-@@ -936,10 +936,10 @@
- #endif
-
- #ifndef LinkGLToUsrLib
--# define LinkGLToUsrLib YES
-+# define LinkGLToUsrLib NO
- #endif
- # ifndef LinkGLToUsrInclude
--# define LinkGLToUsrInclude YES
-+# define LinkGLToUsrInclude NO
- #endif
-
-
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
/*
* If you have Tk (which is required to build XF86Setup), uncomment this
-@@ -413,8 +412,8 @@
- * default.
- * - XF86Setup is not built or supported with XFree86 4.x
- *
--#define HasTk YES
- */
-+#define HasTk YES
-
- /*
- * Set the paths and names for your Tk library if they don't match the
-@@ -427,25 +426,25 @@
- *
- * Some Linux releases need TkLibDir set to /usr/X11R6/lib
- *
--#define TkLibDir /usr/local/lib
--#define TkIncDir /usr/local/include
--#define TkLibName tk
- */
-+#define TkLibDir /usr/lib
-+#define TkIncDir /usr/include
-+#define TkLibName tk
-
- /*
- * By default, XF86Setup is linked with a static Tk library. To change
- * that, uncomment the following line.
- *
--#define XF86SetupUsesStaticTk NO
- */
-+#define XF86SetupUsesStaticTk NO
-
- /*
- * If you have Tcl (which is required to build XF86Setup), uncomment this
- * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
- * default.
- *
--#define HasTcl YES
- */
-+#define HasTcl YES
-
- /*
- * Set the paths and names for your Tcl library if they don't match the
-@@ -455,17 +454,17 @@
- *
- * Some Linux releases need TclIncDir set to /usr/include/tcl.
- *
--#define TclLibDir /usr/local/lib
--#define TclIncDir /usr/local/include
--#define TclLibName tcl
- */
-+#define TclLibDir /usr/lib
-+#define TclIncDir /usr/include
-+#define TclLibName tcl
-
- /*
- * By default, XF86Setup is linked with a static Tcl library. To change
- * that, uncomment the following line.
- *
--#define XF86SetupUsesStaticTcl NO
- */
-+#define XF86SetupUsesStaticTcl NO
-
- /*
- * Build a server that dynamically loads the modules by setting
@@ -677,8 +676,8 @@
* To forceably build static libraries in addition to shared libraries,
* uncomment this.
/* 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/XF86Setup/Imakefile xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile
---- xc.orig/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Dec 30 15:53:38 2002
-+++ xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Dec 30 16:02:13 2002
-@@ -118,7 +118,7 @@
-
- XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \
- '-DPROJECTROOT="$(PROJECTROOT)"' \
-- '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \
-+ '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \
- $(SITE_FONT_PATH) $(SITE_RGB_DB) \
- -DNO_WRAPPERS
-
-diff -urN xc.orig/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl
---- xc.orig/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Dec 30 15:53:38 2002
-+++ xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Dec 30 16:02:13 2002
-@@ -38,7 +38,7 @@
- set devid [lindex $DeviceIDs $idx]
- global Device_$devid
- set server [set Device_${devid}(Server)]
-- set linkname $Xwinhome/bin/X
-+ set linkname /etc/X11/X
- set lastlink $linkname
- for {set nlinks 0} \
- {[file exists $linkname] && [file type $linkname]=="link" \
-@@ -74,7 +74,7 @@
- set CWD [pwd]
- cd $linkdir
- catch "unlink X" ret
-- if [catch "link $Xwinhome/bin/XF86_$server X" ret] {
-+ if [catch "link ../../usr/bin/XF86_$server X" ret] {
- mesg $messages(phase5.4) okay
- } else {
- mesg $messages(phase5.5) okay
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
*/
#ifndef DEF_SERVER_LINE
-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0"
-+#define DEF_SERVER_LINE ":0 local /usr/bin/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/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/bin/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"
++#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"
++#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/bin/xterm"
++#define DEF_FAILSAFE_CLIENT "/usr/X11R6/bin/xterm"
#endif
#ifndef DEF_XDM_CONFIG
-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config"
projects / packages / XFree86.git / blobdiff