.gitignore | 1 +
bin/distro-install-desktop-integration | 26 +++++++++++++-------------
sysui/desktop/share/create_tree.sh | 22 +++++++++++-----------
3 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit 25fd1b81b1afc09b52a9a4471d565baf23d9bebb
Author: Tomas Chvatal <tchva...@suse.cz>
Date: Mon Sep 19 20:35:05 2011 +0200
Ignore config.params file.
diff --git a/.gitignore b/.gitignore
index 3a4e8a1..14e1c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@
/config.guess
/config.log
/config.status
+/config.parms
/configure
/desktop/scripts/soffice.sh
/Makefile
commit af37c0a988109b3b38e68591a5e9a7ea39e2c2a7
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Mon Sep 19 13:56:26 2011 +0200
Use PREFIXDIR when possible
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
commit 03996d64c7fceec611a6a40e42a39e9ad0237ceb
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Mon Sep 19 13:40:48 2011 +0200
Use PREFIXDIR each time possible to allow installing where /usr is not the
prefix
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 80e5c4a..466a9ad 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -12,10 +12,10 @@ create_wrapper()
echo "Install $PREFIXDIR/bin/$1"
if test -L "$DESTDIR$PREFIXDIR/bin/$1" ; then
- # do not overwrite /usr/bin/libreoffice symlink created by
create_tree.sh
+ # do not overwrite $PREFIXDIR/bin/libreoffice symlink created by
create_tree.sh
# the symlink is necessary by java UNO components to find
# the UNO installation using $PATH; this function used to be provided
- # by /usr/bin/soffice symlink, see
+ # by $PREFIXDIR/bin/soffice symlink, see
#
http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
# Note: if you want to support parallel installation of more OOo
versions
# you cannot include this link directly into the package
@@ -87,7 +87,7 @@ add_wrapper()
test -n "$oowrapper_name" && create_man_link "$oowrapper_name"
"$used_man_page" "$file_list"
# add desktop file to the right file list
- test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo
"/usr/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
+ test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo
"$PREFIXDIR/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
}
# install desktop integration from plain packages
@@ -109,8 +109,8 @@ sed -i \
export ICON_PREFIX=$INSTALLDIRNAME
export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
export PRODUCTVERSION=
- export KDEMAINDIR=/usr
- export GNOMEDIR=/usr
+ export KDEMAINDIR=$PREFIXDIR
+ export GNOMEDIR=$PREFIXDIR
export GNOME_MIME_THEME=hicolor
/bin/bash ./create_tree.sh
)
@@ -119,8 +119,8 @@ rm -rf $sysui_temp
# we do not want some stuff from the plain packages
rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin
-rm -f $DESTDIR/usr/share/applications/libreoffice-javafilter.desktop
-rm -f $DESTDIR/usr/share/applications/libreoffice-printeradmin.desktop
+rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop
+rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop
if test -d $DESTDIR/opt ; then
rm -f $DESTDIR/opt/$INSTALLDIRNAME
rmdir --ignore-fail-on-non-empty $DESTDIR/opt
@@ -139,11 +139,11 @@ cd -
# put the stuff installed by create_tree.sh into the right file lists
# desktop files will be added by the corresponding add_wrapper command
if test -f $DESTDIR/gid_Module_Root_Brand ; then
- for dir in /usr/share/application-registry \
- /usr/share/mimelnk/application \
- /usr/share/mime/packages \
- /usr/share/mime-info \
- /usr/share/icons ; do
+ for dir in $PREFIXDIR/share/application-registry \
+ $PREFIXDIR/share/mimelnk/application \
+ $PREFIXDIR/share/mime/packages \
+ $PREFIXDIR/share/mime-info \
+ $PREFIXDIR/share/icons ; do
find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n"
>>$DESTDIR/gid_Module_Root_Brand
done
fi
@@ -162,7 +162,7 @@ add_wrapper libreoffice soffice ""
"libreoffice" "libreoffice-star
add_wrapper loffice soffice "" "libreoffice" ""
"gid_Module_Root_Brand"
add_wrapper unopkg unopkg "" "unopkg" ""
"gid_Module_Root_Brand"
-# /usr/bin/ooffice symlink is necessary by java UNO components to find
+# $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find
# the UNO installation using $PATH, see
# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
# Note: if you want to support parallel installation of more OOo versions
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
