diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-21 16:49:20 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-21 16:49:20 +0200 |
| commit | 2f3c71bce29a0b13a39be1da3526782a63878c6d (patch) | |
| tree | f28e66a24a2fc7a3ede62b0a50ddc36477dd44b3 /sysui/desktop | |
| parent | ad94d3d546c0ed0f02f82836132c751ad9d85446 (diff) | |
use /opt/libreoffice instead of /opt/libreoffice3
discussed on the mailing list; related to the change in bootstrap
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/productversion.mk | 4 | ||||
| -rw-r--r-- | sysui/desktop/share/create_tree.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index fb8570b36b37..e9bd131eff4f 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 044e7939bc40..60aff1738d5d 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 |