r7416 - in trunk/BOOK: . general/prog introduction/welcome

dj at linuxfromscratch.org dj at linuxfromscratch.org
Mon May 5 23:50:32 PDT 2008


Author: dj
Date: 2008-05-06 00:50:32 -0600 (Tue, 06 May 2008)
New Revision: 7416

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/jdk.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Corrected date and minor cleanups for JDK.

Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml	2008-05-06 05:26:07 UTC (rev 7415)
+++ trunk/BOOK/general/prog/jdk.xml	2008-05-06 06:50:32 UTC (rev 7416)
@@ -216,6 +216,13 @@
 <screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &&
 ./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
 
+    <note><para>The installation will end with a message
+    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
+    javaprefix is unset in the environment.  This is by design as
+    <application>GTK+</application> may not be installed during the
+    installation, however, the installation will still exit with a zero error
+    value if scripting the build.</para></note>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>cd jdk&jdk-bin-version-string; &&
@@ -226,7 +233,7 @@
     /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/ &&
 cd ..</userinput></screen>
 
-    <para>Recent versions of libX11 break the statically linked libmawt
+    <para>Recent versions of libX11 break libmawt
     when used with the Xinerama extension.  While still the
     <systemitem class="username">root</systemitem> user, apply the
     following sed to the installed binary to work around this
@@ -235,13 +242,6 @@
 <screen role="root"><userinput>sed -i 's at XINERAMA@FAKEEXTN at g' \
     /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
 
-    <note><para>The installation will end with a message 
-    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
-    javaprefix is unset in the environment.  This is by design as
-    <application>GTK+</application> may not be installed during the
-    installation, however, the installation will still exit with a zero error
-    value if scripting the build.</para></note>
-
     <para>The binary version is now installed.</para>
 
     <para>If you don't want to compile the source or are not in a position to
@@ -438,10 +438,10 @@
       <para>There are now two Java 2 SDKs installed in
       <filename>/opt</filename>. You should decide on which one you
       would like to use as the default. For example if you decide to use the
-      source compiled <application>JDK</application>, do the following as the
+      precompiled <application>JDK</application>, do the following as the
       <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>ln -v -nsf jdk-&jdk-version-string; /opt/jdk</userinput></screen>
+<screen role="root"><userinput>ln -v -nsf jdk-bin-&jdk-bin-version; /opt/jdk</userinput></screen>
 
     <para>The information below assumes your system is set up using the
     instructions found in

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2008-05-06 05:26:07 UTC (rev 7415)
+++ trunk/BOOK/general.ent	2008-05-06 06:50:32 UTC (rev 7416)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2008-05-06 05:26:07 UTC (rev 7415)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2008-05-06 06:50:32 UTC (rev 7416)
@@ -41,11 +41,15 @@
 
 -->
     <listitem>
-      <para>May 5th, 2008</para>
+      <para>May 6th, 2008</para>
       <itemizedlist>
         <listitem>
           <para>[dj] - Removed (commented) more XFree86 related text.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Chaned jdk symlink to use precompiled version and
+          other text cleanups in jdk page.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 




More information about the blfs-book mailing list