]>
Commit | Line | Data |
---|---|---|
505397d5 | 1 | --- XFree86-3.3.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl.fsstnd Mon Mar 30 10:46:28 1998 |
2 | +++ XFree86-3.3.2/xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Mar 30 10:46:49 1998 | |
3 | @@ -38,7 +38,7 @@ | |
4 | set devid [lindex $DeviceIDs $idx] | |
5 | global Device_$devid | |
6 | set server [set Device_${devid}(Server)] | |
7 | - set linkname $Xwinhome/bin/X | |
8 | + set linkname /etc/X11/X | |
9 | set lastlink $linkname | |
10 | for {set nlinks 0} \ | |
11 | {[file exists $linkname] && [file type $linkname]=="link" \ | |
12 | @@ -72,7 +72,7 @@ | |
13 | cd $linkdir | |
14 | catch "unlink X" ret | |
15 | if !$pc98 { | |
16 | - if [catch "link $Xwinhome/bin/XF86_$server X" ret] { | |
17 | + if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] { | |
18 | mesg "Link creation failed!\n\ | |
19 | You'll have to do it yourself" okay | |
20 | } else { | |
21 | --- XFree86-3.3.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile.fsstnd Mon Mar 30 10:46:28 1998 | |
22 | +++ XFree86-3.3.2/xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Mar 30 10:46:49 1998 | |
23 | @@ -78,7 +78,7 @@ | |
24 | ||
25 | XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \ | |
26 | '-DPROJECTROOT="$(PROJECTROOT)"' \ | |
27 | - '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' | |
28 | + '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' | |
29 | ||
30 | XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup | |
31 | DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \ | |
32 | --- XFree86-3.3.2/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c.fsstnd Mon Mar 30 10:46:36 1998 | |
33 | +++ XFree86-3.3.2/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c Mon Mar 30 10:46:49 1998 | |
34 | @@ -104,7 +104,7 @@ | |
35 | #endif | |
36 | ||
37 | /* | |
38 | - * Define this to have /etc/XF86Config prompted for as the default | |
39 | + * Define this to have /etc/X11/XF86Config prompted for as the default | |
40 | * location to write the XF86Config file to. | |
41 | */ | |
42 | #define PREFER_XF86CONFIG_IN_ETC | |
43 | @@ -210,7 +210,7 @@ | |
44 | "This program will create a basic " CONFIGNAME " file, based on menu selections you\n" | |
45 | "make.\n" | |
46 | "\n" | |
47 | -"The " CONFIGNAME " file usually resides in " TREEROOTLX " or /etc. A sample\n" | |
48 | +"The " CONFIGNAME " file usually resides in " TREEROOTLX " or /etc/X11. A sample\n" | |
49 | CONFIGNAME " file is supplied with XFree86; it is configured for a standard\n" | |
50 | "VGA card and monitor with 640x480 resolution. This program will ask for a\n" | |
51 | "pathname when it is ready to write the file.\n" | |
52 | @@ -2827,11 +2827,11 @@ | |
53 | #ifndef __EMX__ | |
54 | if (getuid() == 0) { | |
55 | #ifdef PREFER_XF86CONFIG_IN_ETC | |
56 | - printf("Shall I write it to /etc/XF86Config? "); | |
57 | + printf("Shall I write it to /etc/X11/XF86Config? "); | |
58 | getstring(s); | |
59 | printf("\n"); | |
60 | if (answerisyes(s)) | |
61 | - return "/etc/XF86Config"; | |
62 | + return "/etc/X11/XF86Config"; | |
63 | #endif | |
64 | ||
65 | printf("Please answer the following question with either 'y' or 'n'.\n"); | |
66 | @@ -2842,11 +2842,11 @@ | |
67 | return "/usr/X11R6/lib/X11/XF86Config"; | |
68 | ||
69 | #ifndef PREFER_XF86CONFIG_IN_ETC | |
70 | - printf("Shall I write it to /etc/XF86Config? "); | |
71 | + printf("Shall I write it to /etc/X11/XF86Config? "); | |
72 | getstring(s); | |
73 | printf("\n"); | |
74 | if (answerisyes(s)) | |
75 | - return "/etc/XF86Config"; | |
76 | + return "/etc/X11/XF86Config"; | |
77 | #endif | |
78 | #else /* __EMX__ */ | |
79 | { | |
80 | --- XFree86-3.3.2/xc/programs/Xserver/os/wrapper.c.fsstnd Mon Mar 30 10:59:11 1998 | |
81 | +++ XFree86-3.3.2/xc/programs/Xserver/os/wrapper.c Mon Mar 30 10:59:57 1998 | |
82 | @@ -42,6 +42,9 @@ | |
83 | #define XSERVER_PATH "/usr/X11R6/bin/X" | |
84 | #endif | |
85 | ||
86 | +#undef XSERVER_PATH | |
87 | +#define XSERVER_PATH "/etc/X11/X" | |
88 | + | |
89 | #include <stdio.h> | |
90 | #include <stdlib.h> | |
91 | #include <string.h> |