Changeset 7b7468c1

Timestamp:

05/14/2006 12:29:16 PM (18 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

4880b3d2

Parents:

a13e403

Message:

Text cleanups on the Xfree page

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6072 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/installing/xfree86.xml (modified) (6 diffs)

x/installing/xfree86.xml

@@ -278 +278 @@
       <para>Edit the file for your hardware and desires. You can find more
       options by reading the other files in
-      <filename class="directory">xc/config/cf</filename></para>
+      <filename class="directory">xc/config/cf</filename> and on the wiki.
+      <ulink url='&blfs-wiki;/XFree86-&xfree86-version;'/></para>
 
     </sect3>
@@ -301 +302 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-make install.man &amp;&amp;
-ln -v -s ../X11R6/bin /usr/bin/X11 &amp;&amp;
+make install.man</userinput></screen>
+
+      <para>If you installed <application>XFree86</application> into the default
+      prefix, <filename class="directory">/usr/X11R6</filename>, make these
+      symlinks to work around some applications which look for things in the
+      wrong place. As <systemitem class="username">root</systemitem>:</para>
+
+<screen role="root"><userinput>ln -v -s ../X11R6/bin /usr/bin/X11 &amp;&amp;
 ln -v -s ../X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
 ln -v -s ../X11R6/include/X11 /usr/include/X11</userinput></screen>
@@ -308 +315 @@
       <para>The <application>XFree86</application> fonts have been installed
       outside of <application>Fontconfig</application>'s default search path
-      of <filename class="directory">/usr/share/fonts</filename>.  In order
+      of <filename class="directory">/usr/share/fonts</filename>. In order
       for <application>Fontconfig</application> to find the installed TrueType
-      fonts, you should make symlinks to their directories.  Assuming you've
-      installed <application>XFree86</application> in the default prefix, run the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:</para>
+      fonts, you should make symlinks to their directories. If you installed
+      <application>XFree86</application> with the prefix
+      <filename class="directory">/usr</filename>, omit /X11R6 from the
+      following commands. As <systemitem class="username">root</systemitem>:
+      </para>
 
 <screen role="root"><userinput>install -d -m755 /usr/share/fonts &amp;&amp;
@@ -323 +331 @@
       <application>XExtensions</application> extension libraries but does not
       install the corresponding <application>pkg-config</application> files.
-      Create the files by issuing the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
+      Create the files with these commands. If you installed
+      <application>XFree86</application> with the prefix
+      <filename class="directory">/usr</filename>, omit /X11R6 from the
+      paths. As <systemitem class="username">root</systemitem>:</para>
 
 <screen role="root"><userinput>cat &gt; /usr/X11R6/lib/pkgconfig/xrender.pc &lt;&lt; "EOF"
@@ -365 +375 @@
 
     <para><command>sed -i 's:^.*asm.* ... fbdevhw.c</command>: This sed fixes a
-    problem compiling against kernel headers since linux-2.6.8.</para>
+    problem compiling against headers from kernels newer than linux-2.6.8.</para>
 
     <para><command>sed -i -e "s@^#include &lt;linux/config.h&gt;@...</command>:
@@ -397 +407 @@
     </note>
 
-    <para><command>ln -v -sf ...</command>: These commands are present to
+    <para><command>ln -v -s ...</command>: These commands are present to
     enable other (broken) packages to build against
     <application>XFree86</application>, even though the Filesystem Hierarchy