]>
Commit | Line | Data |
---|---|---|
a6281876 JR |
1 | diff -urN XFree86-3.3.6.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile XFree86-3.3.6/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile |
2 | --- XFree86-3.3.6.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Apr 17 17:51:10 1999 | |
3 | +++ XFree86-3.3.6/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Sat Mar 11 04:36:27 2000 | |
8af5c795 JR |
4 | @@ -81,7 +81,7 @@ |
5 | ||
6 | XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \ | |
7 | '-DPROJECTROOT="$(PROJECTROOT)"' \ | |
8 | - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' | |
9 | + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' | |
10 | ||
11 | XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup | |
12 | DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \ | |
a6281876 JR |
13 | diff -urN XFree86-3.3.6.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl XFree86-3.3.6/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl |
14 | --- XFree86-3.3.6.orig/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Tue Oct 12 20:06:52 1999 | |
15 | +++ XFree86-3.3.6/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Sat Mar 11 04:38:12 2000 | |
505397d5 | 16 | @@ -38,7 +38,7 @@ |
17 | set devid [lindex $DeviceIDs $idx] | |
18 | global Device_$devid | |
19 | set server [set Device_${devid}(Server)] | |
20 | - set linkname $Xwinhome/bin/X | |
21 | + set linkname /etc/X11/X | |
22 | set lastlink $linkname | |
23 | for {set nlinks 0} \ | |
24 | {[file exists $linkname] && [file type $linkname]=="link" \ | |
a6281876 JR |
25 | @@ -75,7 +75,7 @@ |
26 | if [string match XFCom* $server] { | |
27 | set serverpath $Xwinhome/bin/$server | |
28 | } else { | |
29 | - set serverpath $Xwinhome/bin/XF86_$server | |
30 | + set serverpath ../../usr/X11R6/bin/XF86_$server | |
31 | } | |
32 | if [catch "link $serverpath X" ret] { | |
505397d5 | 33 | mesg "Link creation failed!\n\ |
a6281876 JR |
34 | diff -urN XFree86-3.3.6.orig/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c XFree86-3.3.6/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c |
35 | --- XFree86-3.3.6.orig/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c Mon Dec 20 17:40:07 1999 | |
36 | +++ XFree86-3.3.6/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c Sat Mar 11 04:36:27 2000 | |
8af5c795 | 37 | @@ -107,7 +107,7 @@ |
505397d5 | 38 | #endif |
39 | ||
40 | /* | |
41 | - * Define this to have /etc/XF86Config prompted for as the default | |
42 | + * Define this to have /etc/X11/XF86Config prompted for as the default | |
43 | * location to write the XF86Config file to. | |
44 | */ | |
45 | #define PREFER_XF86CONFIG_IN_ETC | |
8af5c795 | 46 | @@ -215,7 +215,7 @@ |
505397d5 | 47 | "This program will create a basic " CONFIGNAME " file, based on menu selections you\n" |
48 | "make.\n" | |
49 | "\n" | |
50 | -"The " CONFIGNAME " file usually resides in " TREEROOTLX " or /etc. A sample\n" | |
51 | +"The " CONFIGNAME " file usually resides in " TREEROOTLX " or /etc/X11. A sample\n" | |
52 | CONFIGNAME " file is supplied with XFree86; it is configured for a standard\n" | |
53 | "VGA card and monitor with 640x480 resolution. This program will ask for a\n" | |
54 | "pathname when it is ready to write the file.\n" | |
8af5c795 JR |
55 | @@ -2986,7 +2986,7 @@ |
56 | #endif | |
505397d5 | 57 | #ifdef PREFER_XF86CONFIG_IN_ETC |
8af5c795 | 58 | #if !(defined(__QNX__) && !defined(__QNXNTO__)) |
505397d5 | 59 | - printf("Shall I write it to /etc/XF86Config? "); |
60 | + printf("Shall I write it to /etc/X11/XF86Config? "); | |
8af5c795 JR |
61 | #else |
62 | printf("Shall I write it to /etc/config/X11/XF86Config.%d? ", | |
63 | getnid()); | |
64 | @@ -2995,7 +2995,7 @@ | |
505397d5 | 65 | printf("\n"); |
66 | if (answerisyes(s)) | |
8af5c795 | 67 | #if !(defined(__QNX__) && !defined(__QNXNTO__)) |
505397d5 | 68 | - return "/etc/XF86Config"; |
69 | + return "/etc/X11/XF86Config"; | |
8af5c795 JR |
70 | #else |
71 | /* In QNX, use XF86Config.nid for filename */ | |
72 | { | |
73 | @@ -3030,11 +3030,11 @@ | |
505397d5 | 74 | #endif |
8af5c795 JR |
75 | |
76 | #ifndef PREFER_XF86CONFIG_IN_ETC | |
77 | - printf("Shall I write it to /etc/XF86Config? "); | |
78 | + printf("Shall I write it to /etc/X11/XF86Config? "); | |
505397d5 | 79 | getstring(s); |
80 | printf("\n"); | |
81 | if (answerisyes(s)) | |
82 | - return "/etc/XF86Config"; | |
83 | + return "/etc/X11/XF86Config"; | |
84 | #endif | |
85 | #else /* __EMX__ */ | |
86 | { | |
a6281876 JR |
87 | diff -urN XFree86-3.3.6.orig/xc/programs/Xserver/os/wrapper.c XFree86-3.3.6/xc/programs/Xserver/os/wrapper.c |
88 | --- XFree86-3.3.6.orig/xc/programs/Xserver/os/wrapper.c Fri Jul 30 15:07:09 1999 | |
89 | +++ XFree86-3.3.6/xc/programs/Xserver/os/wrapper.c Sat Mar 11 04:36:27 2000 | |
505397d5 | 90 | @@ -42,6 +42,9 @@ |
91 | #define XSERVER_PATH "/usr/X11R6/bin/X" | |
92 | #endif | |
93 | ||
94 | +#undef XSERVER_PATH | |
95 | +#define XSERVER_PATH "/etc/X11/X" | |
96 | + | |
97 | #include <stdio.h> | |
98 | #include <stdlib.h> | |
99 | #include <string.h> |