diff options
| author | orbea <orbea@fredslev.dk> | 2018-06-01 12:31:34 -0700 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-13 09:47:04 +0200 |
| commit | 60ab748dcde78a33c1930b758018bf9b3b2650b4 (patch) | |
| tree | 039d01603d53d78da77dbc58d8819837956ed0a4 /sysui | |
| parent | 3f31455fdd10309ab85fc3d324096698d3f38e5b (diff) | |
Respect --bindir..
Change-Id: I2ed73a296b813de722156c69ac64cf9d6cff199d
Reviewed-on: https://gerrit.libreoffice.org/55197
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'sysui')
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 3f24b5fd7bf4..6812d97d9de0 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -52,19 +52,19 @@ if [ "${GNOMEDIR}" ]; then chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".* fi -mkdir -p "${DESTDIR}/${PREFIXDIR}/bin" +mkdir -p "${DESTDIR}/${BINDIR}" test -n "${OFFICE_PREFIX}" && office_prefix="${OFFICE_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}/${PREFIXDIR}/bin/${PREFIX}" +ln -sf "${office_root}/program/soffice" "${DESTDIR}/${BINDIR}/${PREFIX}" if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" - ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}" + ln -sf /${BINDIR}/${PREFIX} "${DESTDIR}/${BINDIR}/libreoffice${PRODUCTVERSION}" fi test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" |