r4618 - in trunk/BOOK: general/prog xsoft/suites

djensen at linuxfromscratch.org djensen at linuxfromscratch.org
Fri Jun 17 06:14:09 PDT 2005


Author: djensen
Date: 2005-06-17 07:14:08 -0600 (Fri, 17 Jun 2005)
New Revision: 4618

Modified:
   trunk/BOOK/general/prog/jdk.xml
   trunk/BOOK/xsoft/suites/openoffice.xml
Log:
oops role=root in JDK, user/root split complete in OpenOffice

Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml	2005-06-17 12:46:59 UTC (rev 4617)
+++ trunk/BOOK/general/prog/jdk.xml	2005-06-17 13:14:08 UTC (rev 4618)
@@ -316,13 +316,13 @@
       compiled <application>JDK</application>, do the following as the
       <systemitem class="username">root</systemitem> user:</para>
 
-<screen> role="root"<userinput>ln -v -nsf jdk-&jdk-src-version; /opt/jdk/jdk</userinput></screen>
+<screen role="root"><userinput>ln -v -nsf jdk-&jdk-src-version; /opt/jdk/jdk</userinput></screen>
 
     <para>Add the following <filename>jdk.sh</filename> shell startup file to
     the <filename>/etc/profile.d</filename> directory with the following
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen> role="root"<userinput>cat > /etc/profile.d/jdk.sh << "EOF"
+<screen role="root"><userinput>cat > /etc/profile.d/jdk.sh << "EOF"
 <literal># Begin /etc/profile.d/jdk.sh
 
 # Set JAVA_HOME directory

Modified: trunk/BOOK/xsoft/suites/openoffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/openoffice.xml	2005-06-17 12:46:59 UTC (rev 4617)
+++ trunk/BOOK/xsoft/suites/openoffice.xml	2005-06-17 13:14:08 UTC (rev 4618)
@@ -157,11 +157,15 @@
     <para>STLport looks for the c++ headers in the wrong location. Put a
     temporary symlink in place to satisfy STLport:</para>
 
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
 <screen role="root"><userinput>ln -sf /usr/include/c++/&gcc-version; /usr/g++-v3</userinput></screen>
 
     <para>Create a temprorary symlink to the JRE's
     <application>motif</application> libraries:</para>
 
+    <para>Again, as the <systemitem class="username">root</systemitem> user:</para>
+
 <screen role="root"><userinput>ln -sf ${JAVA_HOME}/jre/lib/i?86/motif21/libmawt.so /usr/lib</userinput></screen>
 
     <para>If you want to optimize the build, edit
@@ -171,6 +175,8 @@
     is to not use any custom optimizations. The following command removes an
     incorrect <option>-mcpu</option> option in the above file:</para>
 
+    <para>Now, as the normal user:</para>
+
 <screen><userinput>sed -i "s:\-mcpu=pentiumpro::" \
     solenv/inc/unxlngi4.mk</userinput></screen>
 
@@ -221,9 +227,12 @@
     version, replace the 01 with the international telephone country code for
     your country:</para>
 
-<screen role="root"><userinput>cd instsetoo/unxlngi4.pro/01/normal &&
-sed -i "s:^oo_home=.*:oo_home=openoffice:" install &&
-./install --prefix=/opt &&
+<screen><userinput>cd instsetoo/unxlngi4.pro/01/normal &&
+sed -i "s:^oo_home=.*:oo_home=openoffice:" install</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>./install --prefix=/opt &&
 for appl in sagenda scalc sdraw sfax simpress slabel sletter \
     smaster smath smemo soffice spadmin svcard sweb swriter
   do ln -v -sf /opt/openoffice/program/$appl /usr/bin/$appl
@@ -234,14 +243,15 @@
     necessary.  If you use <application>Gnome</application>, you should copy
     the <filename>*.desktop</filename> files to
     <filename>/usr/share/applications</filename> with the following
-    commands:</para>
+    commands as the <systemitem class="username">root</systemitem> use:</para>
 
 <screen role="root"><userinput>install -v -d /usr/share/applications -m 755 &&
 cp -v /opt/openoffice/share/gnome/net/ooo645*.desktop \
     /usr/share/applications/ &&
 rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop</userinput></screen>
 
-    <para>Finally, remove the temporary symlinks:</para>
+    <para>Finally, as the <systemitem class="username">root</systemitem>user:
+    remove the temporary symlinks:</para>
 
 <screen role="root"><userinput>rm /usr/g++-v3 &&
 rm /usr/lib/libmawt.so</userinput></screen>
@@ -295,14 +305,14 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>sagenda, scalc, sdraw, sfax, simpress, slabel,
         sletter, smaster, smath, smemo, soffice, spadmin,
         svcard, sweb, swriter, and support utilities</seg>
         <seg><application>OpenOffice</application> libraries</seg>
-        <seg>Not determined at this time</seg>
+        <seg>/opt/openoffice</seg>
       </seglistitem>
     </segmentedlist>
 




More information about the blfs-book mailing list