diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-06-11 11:04:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-11 13:42:10 +0000 |
| commit | d2cc121e0798a007a6e0409b09c16ce747ab959f (patch) | |
| tree | a42cc2bb8b7f8b48052c08fb56c2ffedc545b720 | |
| parent | 4d7ddfa1a8deda577ee78f13a1635b32118efbb9 (diff) | |
Do not hard code /usr
Not all operation system install packages into /usr, make sure
create-tree.sh do respect the PREFIX variable
Change-Id: Iff358c9e22fb8969afaef2bb96e1f91eb7e91123
Reviewed-on: https://gerrit.libreoffice.org/9730
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rwxr-xr-x | bin/distro-install-desktop-integration | 1 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 20 |
2 files changed, 11 insertions, 10 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 40ad98c786a0..4cf652decc41 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -113,6 +113,7 @@ sed -i \ export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR + export PREFIXDIR=${PREFIXDIR} export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor bash ./create_tree.sh diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 2221a4663417..c6be0bb2a688 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -57,33 +57,33 @@ if [ "${GNOMEDIR}" ]; then chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".* fi -mkdir -p "${DESTDIR}/usr/bin" +mkdir -p "${DESTDIR}/${PREFIXDIR}/bin" 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}/usr/bin/${PREFIX}" +ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${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 /usr/bin/${PREFIX} "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}" + ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}" fi test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" -mkdir -p "${DESTDIR}/usr/share/mime/packages" -cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file" -chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file" +mkdir -p "${DESTDIR}/${PREFIXDIR}/share/mime/packages" +cp openoffice.org.xml "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file" +chmod 0644 "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file" -mkdir -p "${DESTDIR}/usr/share/applications" +mkdir -p "${DESTDIR}/${PREFIXDIR}/share/applications" for i in `cat launcherlist`; do - ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/usr/share/applications/${PREFIX}-${i}" + ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}" done -mkdir -p "${DESTDIR}/usr/share/appdata" +mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata" for i in base calc draw impress writer; do - cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml" + cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml" done |