diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
| commit | c939070f709143482ce749603c0e1f0d84df443c (patch) | |
| tree | c7ed48d5fa87e8ec699f006f49404ce6aa538925 /sysui/desktop/share | |
| parent | a0f911669be348a5539687e4ebe25446d526b2a8 (diff) | |
| parent | 066ee33f2754e36cf7b6c39d2c2bff3b31f55951 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
Diffstat (limited to 'sysui/desktop/share')
| -rw-r--r-- | sysui/desktop/share/create_tree.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 460a27c5fd9b..eef34d9549b2 100644 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -92,7 +92,8 @@ fi mkdir -p ${DESTDIR}/usr/bin -office_root=/opt/${PREFIX} +office_prefix=/opt +office_root=${office_prefix}/${PREFIX} #this symlink is needed to have the API boostrap functions running right ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice @@ -101,7 +102,9 @@ cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin if test "${PREFIX}" != libreoffice ; then - cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX} + # compat symlinks + mkdir -p ${DESTDIR}${office_prefix} + ln -sf libreoffice ${DESTDIR}${office_root} ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin fi |