diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 22:33:02 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 22:33:02 -0600 |
| commit | f9b4521edc6a2370ca773aa80d3719d4bb45190d (patch) | |
| tree | 47d70f7153b76720096786f33d4642d979286299 /sysui/desktop/share/create_tree.sh | |
| parent | af12942f68dba5d0d2b6fd39f63566d5fc3af4b8 (diff) | |
merge non-conflicting changes in sysui and ucb
Diffstat (limited to 'sysui/desktop/share/create_tree.sh')
| -rw-r--r-- | sysui/desktop/share/create_tree.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 84af1c75a4..160b2db44f 100644 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -92,17 +92,26 @@ fi mkdir -p ${DESTDIR}/usr/bin -office_root=/opt/${PREFIX} +office_prefix=/opt +office_root=${office_prefix}/${PREFIX} -ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice +#this symlink is needed to have the API boostrap functions running right +ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice -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 +if test "${PREFIX}" != libreoffice ; then + # 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 + mkdir -p ${DESTDIR}/usr/share/mime/packages -cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/ -chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml +cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml +chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice.xml mkdir -p ${DESTDIR}/usr/share/applications for i in `cat launcherlist`; do |