diff --git a/general.ent b/general.ent
index 5687fdb665..5000d08dfd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 18f9365b7d..0eba2e6c26 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
-->
+
+ February 27th, 2014
+
+
+ [igor] - Set an environment variable for libreoffice installation
+ prefix. Fixes #4725.
+
+
+
+
February 26th, 2014
diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml
index ba76e0ae97..b63ac06f5f 100644
--- a/xsoft/office/libreoffice.xml
+++ b/xsoft/office/libreoffice.xml
@@ -292,17 +292,25 @@ ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/
- 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.
+
+
+
+ Due to the large size of the package, you may prefer to install it in
/opt, instead of
/usr. Depending on your choice,
replace <PREFIX> by
/usr or by
- /opt/libreoffice-&libreoffice-dlversion;
- in the rest of the page. Prepare LibreOffice
- for compilation by running the following commands:
+ /opt/libreoffice-&libreoffice-dlversion;:
+
+
+export LO_PREFIX=<PREFIX>
+
+
+ Prepare LibreOffice for compilation by running
+ the following commands:
sed -e "/gzip -f/d" \
@@ -316,7 +324,7 @@ sed -e "s/target\.mk/langlist\.mk/" \
-e "/tar -x/s/lo_src_dir/start_dir/" \
-i bin/unpack-sources &&
-./autogen.sh --prefix=<PREFIX> \
+./autogen.sh --prefix=$LO_PREFIX \
--sysconfdir=/etc \
--with-vendor="BLFS" \
--with-lang="en-US pt-BR" \
@@ -369,9 +377,9 @@ sed -e "s/target\.mk/langlist\.mk/" \
make distro-pack-install &&
-install -v -m755 -d <PREFIX>/share/appdata &&
+install -v -m755 -d $LO_PREFIX/share/appdata &&
install -v -m644 sysui/desktop/appstream-appdata/*.xml \
- <PREFIX>/share/appdata
+ $LO_PREFIX/share/appdata
If the dictionaries have been built, again as
@@ -379,17 +387,14 @@ install -v -m644 sysui/desktop/appstream-appdata/*.xml \
chown -cR 0:0 dictionaries/ &&
-mkdir -pv <PREFIX>/lib/libreoffice/share/extensions/dict-en &&
-cp -vR dictionaries/en/* <PREFIX>/lib/libreoffice/share/extensions/dict-en &&
-mkdir -pv <PREFIX>/lib/libreoffice/share/extensions/dict-pt-BR &&
-cp -vR dictionaries/pt_BR/* <PREFIX>/lib/libreoffice/share/extensions/dict-pt-BR
+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
- In the following, do not replace
- /usr by
- /opt/libreoffice-&libreoffice-dlversion;.
- If installed in /opt and the
- icons in the new items of the desktop menu are not properly displayed,
+ If installed in /opt/libreoffice-&libreoffice-dlversion;
+ and the icons in the new items of the desktop menu are not properly displayed,
optionally run the following commands, as
root user (it may be necessary
to logout the session, before the icons appear):
@@ -564,14 +569,14 @@ unset i
libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
loimpress, lomath, loweb, lowriter, soffice and unopkg;
several programs under
- <PREFIX>/lib/libreoffice/program
+ $LO_PREFIX/lib/libreoffice/program
several libraries under
- <PREFIX>/lib/libreoffice/{ure/lib,program}
+ $LO_PREFIX/lib/libreoffice/{ure/lib,program}
- <PREFIX>/lib/libreoffice
+ $LO_PREFIX/lib/libreoffice