Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


use PREFIXDIR instead of hard coding /usr in create_tree.sh

---
Bapt
From 54636c9ca659736040e8cafed2c201815de2ffbd Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 19 Sep 2011 13:56:26 +0200
Subject: [PATCH 4/5] Use PREFIXDIR when possible

---
 sysui/desktop/share/create_tree.sh |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 141e9a1..a694f6d 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -42,31 +42,31 @@ 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}"
 
-cp printeradmin.sh "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
-chmod 0755 "${DESTDIR}/usr/bin/${PREFIX}-printeradmin"
+cp printeradmin.sh "${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin"
+chmod 0755 "${DESTDIR}$PREFIXDIR/bin/${PREFIX}-printeradmin"
 
 if test "${PREFIX}" != libreoffice${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 /usr/bin/${PREFIX}-printeradmin 
"${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin"
+    ln -sf $PREFIXDIR/bin/${PREFIX} "${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}"
+    ln -sf $PREFIXDIR/bin/${PREFIX}-printeradmin 
"${DESTDIR}$PREFIXDIR/bin/libreoffice${PRODUCTVERSION}-printeradmin"
 fi
 
-mkdir -p "${DESTDIR}/usr/share/mime/packages"
-cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
-chmod 0644 "${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
+mkdir -p "${DESTDIR}$PREFIXDIR/share/mime/packages"
+cp openoffice.org.xml "${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
+chmod 0644 "${DESTDIR}$PREFIXDIR/share/mime/packages/libreoffice${PRODUCTVERSION}.xml"
 
-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
 
-- 
1.7.6

Attachment: pgp_5NaFstdb0.pgp
Description: PGP signature


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.