r7045 - in trunk/BOOK: general/prog multimedia/libdriv x/lib

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Aug 11 18:04:53 PDT 2007


Author: randy
Date: 2007-08-11 19:04:53 -0600 (Sat, 11 Aug 2007)
New Revision: 7045

Modified:
   trunk/BOOK/general/prog/jdk.xml
   trunk/BOOK/multimedia/libdriv/sdl.xml
   trunk/BOOK/x/lib/lesstif.xml
   trunk/BOOK/x/lib/qt.xml
Log:
Replaced some /usr/X11R6 hacks with references to the compatibility symlink

Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml	2007-08-11 23:32:14 UTC (rev 7044)
+++ trunk/BOOK/general/prog/jdk.xml	2007-08-12 01:04:53 UTC (rev 7045)
@@ -269,13 +269,16 @@
     do patch -Np1 -i ${PATCH}
 done</userinput></screen>
 
-    <para>If your <application>X Window System</application> is installed into
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!-- <para>If your <application>X Window System</application> is installed into
     any prefix other than <filename class="directory">/usr/X11R6</filename>,
     execute the following command, replacing
     <replaceable><PREFIX></replaceable> with the installation prefix of
     the <application>X Window System</application>:</para>
 
-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {} \;</userinput></screen>
+<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {} \;</userinput></screen> -->
 
     <para>Set/unset some variables which affect the build:</para>
 

Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml	2007-08-11 23:32:14 UTC (rev 7044)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml	2007-08-12 01:04:53 UTC (rev 7045)
@@ -78,13 +78,16 @@
   <sect2 role="installation">
     <title>Installation of SDL</title>
 
-    <para>If your <application>X Window System</application> is installed into
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!-- <para>If your <application>X Window System</application> is installed into
     any prefix other than <filename class="directory">/usr/X11R6</filename>,
     execute the following command, replacing
     <replaceable><PREFIX></replaceable> with the installation prefix of
     the <application>X Window System</application>:</para>
 
-<screen><userinput>sed -i 's:/usr/X11R6:<replaceable><PREFIX></replaceable>:' configure</userinput></screen>
+<screen><userinput>sed -i 's:/usr/X11R6:<replaceable><PREFIX></replaceable>:' configure</userinput></screen> -->
 
     <para>Install <application>SDL</application> by running the
     following commands:</para>

Modified: trunk/BOOK/x/lib/lesstif.xml
===================================================================
--- trunk/BOOK/x/lib/lesstif.xml	2007-08-11 23:32:14 UTC (rev 7044)
+++ trunk/BOOK/x/lib/lesstif.xml	2007-08-12 01:04:53 UTC (rev 7045)
@@ -107,7 +107,7 @@
     the command below if your X Window System is installed anywhere other than
     <filename class='directory'>/usr/X11R6</filename>.</para>
 
-<screen role="root"><userinput>ln -v -s <replaceable>/usr/X11R6</replaceable>/lib/X11/mwm /etc/X11</userinput></screen>
+<screen role="root"><userinput>ln -v -s <replaceable></usr/X11R6></replaceable>/lib/X11/mwm /etc/X11</userinput></screen>
 
   </sect2>
 
@@ -134,7 +134,7 @@
     directory.</para>
 
     <para><command>ln -v -s
-    <replaceable>/usr/X11R6</replaceable>/lib/X11/mwm /etc/X11</command>:
+    <replaceable></usr/X11R6></replaceable>/lib/X11/mwm /etc/X11</command>:
     Configuration directories located in the <application>X</application>
     installation prefix heirarchy typically have a symlink in the
     <filename class='directory'>/etc/X11</filename> directory pointing back to

Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml	2007-08-11 23:32:14 UTC (rev 7044)
+++ trunk/BOOK/x/lib/qt.xml	2007-08-12 01:04:53 UTC (rev 7045)
@@ -99,8 +99,11 @@
   <sect2 role="installation">
     <title>Installation of Qt</title>
 
-    <para>The <application>Qt</application> source hard codes the location
-    of the <application>X Window System</application> installtion to
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!--<para>The <application>Qt</application> source hard codes the location
+    of the <application>X Window System</application> installation to
     <filename class="directory">/usr/X11R6</filename>.  If you've installed
     the <application>X Window System</application> in any prefix other than
     <filename class="directory">/usr/X11R6</filename>, then you should correct
@@ -112,7 +115,7 @@
 <screen><userinput>for file in $(grep -lr "X11R6" *)
 do
     sed -i "s@/usr/X11R6@<replaceable><PREFIX></replaceable>@g" $file
-done</userinput></screen>
+done</userinput></screen> -->
 
     <para>There are several ways to install a complicated package such as
     <application>Qt</application>. The files are not completely position




More information about the blfs-book mailing list