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

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Thu Feb 27 04:19:13 PST 2014


Author: igor
Date: Thu Feb 27 04:19:13 2014
New Revision: 12794

Log:
Set an environment variable for libreoffice installation prefix.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/libreoffice.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Thu Feb 27 03:06:47 2014	(r12793)
+++ trunk/BOOK/general.ent	Thu Feb 27 04:19:13 2014	(r12794)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 26th, &year;">
+<!ENTITY releasedate  "February 27th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Thu Feb 27 03:06:47 2014	(r12793)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Thu Feb 27 04:19:13 2014	(r12794)
@@ -45,6 +45,16 @@
 -->
 
     <listitem>
+      <para>February 27th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Set an environment variable for libreoffice installation
+          prefix.  Fixes <ulink url="&blfs-ticket-root;4725">#4725</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 26th, 2014</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml	Thu Feb 27 03:06:47 2014	(r12793)
+++ trunk/BOOK/xsoft/office/libreoffice.xml	Thu Feb 27 04:19:13 2014	(r12794)
@@ -292,17 +292,25 @@
     </note>
 
     <para>
-      In the rest of the page, locales "en-US" and "pt-BR" are examples; the
-      user will change them to suit his needs - you might want to read the
-      "Command Explanations", further below, before proceeding. Due to the
-      large size of the package, the user may prefer to install in
+      In the rest of the page, locales "en-US" and "pt-BR" are examples; you
+      can change them to suit your needs - you might want to read the
+      "Command Explanations", further below, before proceeding.
+    </para>
+    
+    <para>
+      Due to the large size of the package, you may prefer to install it in
       <filename class="directory">/opt</filename>, instead of
       <filename class="directory">/usr</filename>. Depending on your choice,
       replace <replaceable><PREFIX></replaceable> by
       <filename class="directory">/usr</filename> or by
-      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-      in the rest of the page. Prepare <application>LibreOffice</application>
-      for compilation by running the following commands:
+      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>:
+    </para>
+
+<screen><userinput>export LO_PREFIX=<replaceable><PREFIX></replaceable></userinput></screen>
+    
+    <para>
+      Prepare <application>LibreOffice</application> for compilation by running
+      the following commands:
     </para>
 
 <screen><userinput>sed -e "/gzip -f/d"   \
@@ -316,7 +324,7 @@
     -e "/tar -x/s/lo_src_dir/start_dir/"           \
     -i bin/unpack-sources                          &&
 
-./autogen.sh --prefix=<replaceable><PREFIX></replaceable>           \
+./autogen.sh --prefix=$LO_PREFIX         \
              --sysconfdir=/etc           \
              --with-vendor="BLFS"        \
              --with-lang="en-US pt-BR"   \
@@ -369,9 +377,9 @@
     </para>
 
 <screen role="root"><userinput>make distro-pack-install                                  &&
-install -v -m755 -d <replaceable><PREFIX></replaceable>/share/appdata                &&
+install -v -m755 -d $LO_PREFIX/share/appdata                &&
 install -v -m644    sysui/desktop/appstream-appdata/*.xml \
-                    <replaceable><PREFIX></replaceable>/share/appdata</userinput></screen>
+                    $LO_PREFIX/share/appdata</userinput></screen>
 
     <para>
        If the dictionaries have been built, again as
@@ -379,17 +387,14 @@
     </para>
 
 <screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                      &&
-mkdir -pv <replaceable><PREFIX></replaceable>/lib/libreoffice/share/extensions/dict-en                      &&
-cp -vR dictionaries/en/*    <replaceable><PREFIX></replaceable>/lib/libreoffice/share/extensions/dict-en    &&
-mkdir -pv <replaceable><PREFIX></replaceable>/lib/libreoffice/share/extensions/dict-pt-BR                   &&
-cp -vR dictionaries/pt_BR/* <replaceable><PREFIX></replaceable>/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
+mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &&
+cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &&
+mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR                   &&
+cp -vR dictionaries/pt_BR/* $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
 
     <para>
-       In the following, do not replace
-       <filename class="directory">/usr</filename> by
-       <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>.
-       If installed in <filename class="directory">/opt</filename> and the
-       icons in the new items of the desktop menu are not properly displayed,
+       If installed in <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
+       and the icons in the new items of the desktop menu are not properly displayed,
        optionally run the following commands, as
        <systemitem class="username">root</systemitem> user (it may be necessary
        to logout the session, before the icons appear):
@@ -564,14 +569,14 @@
           libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
           loimpress, lomath, loweb, lowriter, soffice and unopkg;
           several programs under
-          <userinput><replaceable><PREFIX></replaceable></userinput>/lib/libreoffice/program
+          $LO_PREFIX/lib/libreoffice/program
         </seg>
         <seg>
           several libraries under
-          <userinput><replaceable><PREFIX></replaceable></userinput>/lib/libreoffice/{ure/lib,program}
+          $LO_PREFIX/lib/libreoffice/{ure/lib,program}
         </seg>
         <seg>
-          <userinput><replaceable><PREFIX></replaceable></userinput>/lib/libreoffice
+          $LO_PREFIX/lib/libreoffice
         </seg>
       </seglistitem>
     </segmentedlist>



More information about the blfs-book mailing list