[blfs-book] r10229 - in trunk/BOOK: . introduction/welcome xsoft/office

[bdubbs]

Author: bdubbs
Date: 2012-05-24 09:06:52 -0600 (Thu, 24 May 2012)
New Revision: 10229

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/libreoffice.xml
Log:
Clarify libreoffice install instructions

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-05-24 02:48:38 UTC (rev 10228)
+++ trunk/BOOK/general.ent      2012-05-24 15:06:52 UTC (rev 10229)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 20th, &year;">
+<!ENTITY releasedate  "May 24th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-05-24 02:48:38 UTC 
(rev 10228)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-05-24 15:06:52 UTC 
(rev 10229)
@@ -42,6 +42,15 @@
 
 -->
     <listitem>
+      <para>May 24th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Clarify libreoffice install instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 20th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
===================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml     2012-05-24 02:48:38 UTC (rev 
10228)
+++ trunk/BOOK/xsoft/office/libreoffice.xml     2012-05-24 15:06:52 UTC (rev 
10229)
@@ -204,16 +204,17 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make install                                 
&amp;&amp;
+SOFFICE=/usr/lib/libreoffice/program/soffice &amp;&amp;
 for program in base calc draw impress math writer
 do
-  echo "#!/bin/bash
-  exec /usr/lib/libreoffice/program/soffice --nologo --${program} \"\${@}\"" \
-    > /usr/bin/${program}
+  echo '#!/bin/bash' > /usr/bin/${program}
+  echo "exec $SOFFICE --nologo --${program} \"\${@}\"" >> /usr/bin/${program}
   chmod 755 /usr/bin/${program}
-done &amp;&amp;
-ln -s ../lib/libreoffice/program/spadmin /usr/bin/printeradmin &amp;&amp;
-ln -s ../lib/libreoffice/program/unopkg /usr/bin &amp;&amp;
+done          &amp;&amp;
+unset SOFFICE &amp;&amp;
+ln -s ../lib/libreoffice/program/spadmin /usr/bin/printeradmin  &amp;&amp;
+ln -s ../lib/libreoffice/program/unopkg /usr/bin                &amp;&amp;
 cp sysui/desktop/man/{libreoffice,unopkg}.1 /usr/share/man/man1 &amp;&amp;
 for res in 16 32 48 128 256
 do

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page