[Libreoffice-commits] .: sysui/desktop

[Petr Mladek]

 sysui/desktop/productversion.mk    |    4 ++--
 sysui/desktop/share/create_tree.sh |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit bded332eb991c28ea514a2298bb107ec43dea3e5
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 21 16:49:20 2010 +0200

    use /opt/libreoffice instead of /opt/libreoffice3
    
    discussed on the mailing list; related to the change in bootstrap

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index fb8570b..e9bd131 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -62,14 +62,14 @@ PRODUCTNAME.libreoffice = LibreOffice
 PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
 PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT)
 PKGVERSION.libreoffice = $(PKGVERSION)
-UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSIONSHORT.libreoffice)
+UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)
 ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
 
 PRODUCTNAME.broffice.org = BrOffice.org
 PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
 PRODUCTVERSIONSHORT.broffice.org = $(PRODUCTVERSIONSHORT)
 PKGVERSION.broffice.org = $(PKGVERSION)
-UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSIONSHORT.broffice.org)
+UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)
 ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g)
 
 
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 1ed7da9..48b0458 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -98,8 +98,10 @@ cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
-ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
+if test "${PREFIX}" != libreoffice ; then
+    ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+    ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
+fi
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
 cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml