Changeset e1d8846

Timestamp:

05/24/2012 03:06:52 PM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ba3aa2bc

Parents:

55b07cb

Message:

Clarify libreoffice install instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10229 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (1 diff)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10 +10 @@
 <!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 -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <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>

xsoft/office/libreoffice.xml

@@ -205 +205 @@
     </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