r5438 - trunk/BOOK/x/installing

andy at linuxfromscratch.org andy at linuxfromscratch.org
Sat Dec 17 06:21:54 PST 2005


Author: andy
Date: 2005-12-17 07:21:53 -0700 (Sat, 17 Dec 2005)
New Revision: 5438

Modified:
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/xfree86.xml
   trunk/BOOK/x/installing/xorg.xml
Log:
Altered the default location where we install X windows fonts to /usr/share/fonts


Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2005-12-17 13:15:36 UTC (rev 5437)
+++ trunk/BOOK/x/installing/x-setup.xml	2005-12-17 14:21:53 UTC (rev 5438)
@@ -92,12 +92,6 @@
         <filename>xorg.conf</filename>.</para>
       </listitem>
       <listitem>
-        <para>Ensure the <option>FontPath</option> in
-        <filename>XF86Config</filename> or <filename>xorg.conf</filename>
-        contains the <application>TrueType</application> font
-        directory.</para>
-      </listitem>
-      <listitem>
         <para>Update the font cache files</para>
       </listitem>
     </itemizedlist>
@@ -116,13 +110,13 @@
       <para>The build of <application>X</application> as given above
       automatically creates a <application>TrueType</application> font
       directory: <filename
-      class="directory">/usr/X11R6/lib/X11/fonts/TTF</filename>. This
+      class="directory">/usr/share/fonts/TTF</filename>. This
       directory already has some <application>TrueType</application>
       fonts and is set up correctly. If this directory is satisfactory,
       copy any other <application>TrueType</application> fonts you want
       into that directory. If not, create a new directory, preferably
       in the <filename
-      class="directory">/usr/X11R6/lib/X11/fonts/</filename> directory
+      class="directory">/usr/share/fonts/</filename> directory
       and put your <application>TrueType</application> fonts there.</para>
 
     </sect3>
@@ -179,23 +173,10 @@
     </sect3>
 
     <sect3>
-      <title>Ensure the FontPath in 'XF86Config' or 'xorg.conf' Points to the
-      TrueType Font Directory</title>
-
-      <para>The "Files" section should look like:</para>
-
-<screen><literal>Section "Files"
-    ...
-    FontPath "/usr/X11R6/lib/X11/fonts/<replaceable>[TrueTypeDir]</replaceable>/"
-    ...
-EndSection</literal></screen>
-
-    </sect3>
-
-    <sect3>
       <title>Update the Font Cache Files</title>
 
-      <para>Ensure you have the following directory entries in
+      <para>If you decided not to install X windows fonts into /usr/share/fonts then
+      ensure you have the following directory entries in
       <filename>/etc/fonts/local.conf</filename>, inside the fontconfig
       tags. Create <filename>/etc/fonts/local.conf</filename> using the
       following commands:</para>

Modified: trunk/BOOK/x/installing/xfree86.xml
===================================================================
--- trunk/BOOK/x/installing/xfree86.xml	2005-12-17 13:15:36 UTC (rev 5437)
+++ trunk/BOOK/x/installing/xfree86.xml	2005-12-17 14:21:53 UTC (rev 5438)
@@ -317,14 +317,13 @@
 #define HasLibpng                YES
 #define HasZlib                  YES
 
-/* The font path can be redefined in the XF86Config file *************/
-
 /*
-#define DefaultFontPath          $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
-$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
-$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
-*/
+ * Comment out the following define if you would prefer to install the
+ * fonts into /usr/X11R6/lib/X11/fonts. /usr/share/fonts is in
+ * fontconfig's default font search path.
+ */
 
+#define FontDir /usr/share/fonts
 
 /* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These
  * are the defaults. **************************************************/

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2005-12-17 13:15:36 UTC (rev 5437)
+++ trunk/BOOK/x/installing/xorg.xml	2005-12-17 14:21:53 UTC (rev 5438)
@@ -291,6 +291,14 @@
 #define HasZlib                 YES
 
 /*
+ * Comment out the following define if you would prefer to install the
+ * fonts into /usr/X11R6/lib/X11/fonts. /usr/share/fonts is in
+ * fontconfig's default font search path.
+ */
+
+#define FontDir /usr/share/fonts
+
+/*
  * Which drivers to build.  When building a static server, each of
  * these will be included in it.  When building the loadable server
  * each of these modules will be built.
@@ -334,13 +342,6 @@
 #define LinkGLToUsrLib          NO
  */
 
-/* Uncomment the following define if you would prefer to install the
- * fonts into /usr/share/fonts, a directory that is fontconfig's default
- * font search path.
- *
-#define FontDir /usr/share/fonts
- */
-
 /* End Xorg host.def file */</literal>
 EOF</userinput></screen>
 




More information about the blfs-book mailing list