r8632 - in trunk/BOOK: . general/genutils introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed Oct 13 20:27:09 PDT 2010


Author: dj
Date: 2010-10-13 21:27:03 -0600 (Wed, 13 Oct 2010)
New Revision: 8632

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genutils/xterm.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7lib.xml
Log:
Updated Xorg for FHS compliance. Thanks 'linux fan'.

Modified: trunk/BOOK/general/genutils/xterm.xml
===================================================================
--- trunk/BOOK/general/genutils/xterm.xml	2010-10-13 00:46:32 UTC (rev 8631)
+++ trunk/BOOK/general/genutils/xterm.xml	2010-10-14 03:27:03 UTC (rev 8632)
@@ -80,7 +80,7 @@
 echo -e '\tkbs=\\177,' >>terminfo &&
 TERMINFO=/usr/lib/terminfo ./configure $XORG_CONFIG \
     --enable-luit --enable-wide-chars \
-    --with-app-defaults=$XORG_PREFIX/share/X11/app-defaults &&
+    --with-app-defaults=/etc/X11/app-defaults &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2010-10-13 00:46:32 UTC (rev 8631)
+++ trunk/BOOK/general.ent	2010-10-14 03:27:03 UTC (rev 8632)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
 <!ENTITY copyrightdate "2001-&year;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2010-10-13 00:46:32 UTC (rev 8631)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2010-10-14 03:27:03 UTC (rev 8632)
@@ -28,7 +28,7 @@
 <!-- Changelog template
 
     <listitem>
-      <para>Date</para>
+      <para>MMMM DD{nd,st,th}, YYYY</para>
       <itemizedlist>
         <listitem>
           <para>[name] - Changelog entry.</para>
@@ -42,9 +42,20 @@
 -->
 
     <listitem>
-      <para>October 12th</para>
+      <para>October 14th, 2010</para>
       <itemizedlist>
         <listitem>
+          <para>[dj] - Removed FHS section of X Setup page and corrected
+          in the installation instructions for individual packages. Thanks to
+          <quote>linux fan</quote> for the suggestions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>October 12th, 2010</para>
+      <itemizedlist>
+        <listitem>
           <para>[ken] - Updated to Gimp-2.6.8. Fixes ticket
           <ulink url="&blfs-ticket-root;2619">#2619</ulink></para>
         </listitem>
@@ -55,7 +66,7 @@
     </listitem>
 
     <listitem>
-      <para>October 10th</para>
+      <para>October 10th, 2010</para>
       <itemizedlist>
         <listitem>
           <para>[ken] - Added new package, Babl-0.1.2. Fixes ticket
@@ -69,7 +80,7 @@
     </listitem>
 
     <listitem>
-      <para>September 27th</para>
+      <para>September 27th, 2010</para>
       <itemizedlist>
         <listitem>
           <para>[ken] - Marked a few packages that are known to be OK with LFS-6.7.</para>

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2010-10-13 00:46:32 UTC (rev 8631)
+++ trunk/BOOK/x/installing/x-setup.xml	2010-10-14 03:27:03 UTC (rev 8632)
@@ -51,7 +51,7 @@
 
 <screen role="root"><userinput>ln -vsf <replaceable><$XORG_PREFIX></replaceable> /usr/X11R6</userinput></screen>
 
-    <para>Packages in Xorg store their configuration files in
+<!--    <para>Packages in Xorg store their configuration files in
     <filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
     This is strictly against FHS guidelines.  Correct the installation
     <filename class="directory">/etc/X11</filename> and create symlinks
@@ -65,6 +65,7 @@
      ln -v -s /etc/X11/$(basename $file) $file
 done
 </userinput></screen>
+-->
 
   </sect2>
 

Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml	2010-10-13 00:46:32 UTC (rev 8631)
+++ trunk/BOOK/x/installing/x7app.xml	2010-10-14 03:27:03 UTC (rev 8632)
@@ -101,7 +101,19 @@
     <para>Install the applications by running the following commands for each
     package:</para>
 
-<screen><userinput>./configure $XORG_CONFIG &&
+<screen><userinput>case $(basename "$PWD") in
+  twm-[0-9]* )
+               sed -e '/^rcdir =/s,^\(rcdir = \).*,\1/etc/X11/app-defaults,' \
+                   -i src/Makefile.in &&
+               ./configure $XORG_CONFIG
+               ;;
+xinit-[0-9]* )
+               ./configure $XORG_CONFIG --with-xinitdir=/etc/X11/app-defautls
+               ;;
+           * )
+               ./configure $XORG_CONFIG
+               ;;
+esac &&
 make</userinput></screen>
 
     <para>These packages do not provide test suites.</para>

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2010-10-13 00:46:32 UTC (rev 8631)
+++ trunk/BOOK/x/installing/x7lib.xml	2010-10-14 03:27:03 UTC (rev 8632)
@@ -113,6 +113,10 @@
   libX11-[0-9]* )
                  ./configure $XORG_CONFIG --without-xcb
                  ;;
+   libXt-[0-9]* )
+                 ./configure $XORG_CONFIG \
+                     --with-appdefaultdir=/etc/X11/app-defaults
+                 ;;
               * )
                  ./configure $XORG_CONFIG
                  ;;




More information about the blfs-book mailing list