Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 629e4999864e62ca73feb4ed3bced0f43d5b802b)
+++ xsoft/office/libreoffice.xml	(revision 0c77b5ab2e214cb31a56719e1f38cd07c49d22ea)
@@ -293,15 +293,23 @@
 
     <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>&lt;PREFIX&gt;</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>&lt;PREFIX&gt;</replaceable></userinput></screen>
+    
+    <para>
+      Prepare <application>LibreOffice</application> for compilation by running
+      the following commands:
     </para>
 
@@ -317,5 +325,5 @@
     -i bin/unpack-sources                          &amp;&amp;
 
-./autogen.sh --prefix=<replaceable>&lt;PREFIX&gt;</replaceable>           \
+./autogen.sh --prefix=$LO_PREFIX         \
              --sysconfdir=/etc           \
              --with-vendor="BLFS"        \
@@ -370,7 +378,7 @@
 
 <screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
-install -v -m755 -d <replaceable>&lt;PREFIX&gt;</replaceable>/share/appdata                &amp;&amp;
+install -v -m755 -d $LO_PREFIX/share/appdata                &amp;&amp;
 install -v -m644    sysui/desktop/appstream-appdata/*.xml \
-                    <replaceable>&lt;PREFIX&gt;</replaceable>/share/appdata</userinput></screen>
+                    $LO_PREFIX/share/appdata</userinput></screen>
 
     <para>
@@ -380,15 +388,12 @@
 
 <screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                      &amp;&amp;
-mkdir -pv <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
-cp -vR dictionaries/en/*    <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
-mkdir -pv <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
-cp -vR dictionaries/pt_BR/* <replaceable>&lt;PREFIX&gt;</replaceable>/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,
+mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
+cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
+mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
+cp -vR dictionaries/pt_BR/* $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
+
+    <para>
+       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
@@ -565,12 +570,12 @@
           loimpress, lomath, loweb, lowriter, soffice and unopkg;
           several programs under
-          <userinput><replaceable>&lt;PREFIX&gt;</replaceable></userinput>/lib/libreoffice/program
+          $LO_PREFIX/lib/libreoffice/program
         </seg>
         <seg>
           several libraries under
-          <userinput><replaceable>&lt;PREFIX&gt;</replaceable></userinput>/lib/libreoffice/{ure/lib,program}
+          $LO_PREFIX/lib/libreoffice/{ure/lib,program}
         </seg>
         <seg>
-          <userinput><replaceable>&lt;PREFIX&gt;</replaceable></userinput>/lib/libreoffice
+          $LO_PREFIX/lib/libreoffice
         </seg>
       </seglistitem>
