--- bin/distro-install-desktop-integration.orig	2011-08-15 19:46:21.000000000 +0200
+++ bin/distro-install-desktop-integration	2011-09-09 16:00:15.645182583 +0200
@@ -74,21 +74,21 @@
     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
-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
-cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp"
+sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX`
+cp -a sysui/unx*/misc/libreoffice/* "$sysui_temp"
 cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
 builddir=`pwd`
 cd $sysui_temp
 # we want non-versioned stuff in the distro packages
-sed -i \
-    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-    *
+#sed -i \
+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
+#    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
+#    *
 # call in subshell to do not malfrom PRODUCTVERSION, ...
 (
     export OFFICE_PREFIX=$LIBDIR
@@ -96,8 +96,8 @@
     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
 )
@@ -106,32 +106,32 @@
 
 # we do not want some stuff from the plain packages
 rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME*
-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
 fi
 
 # we want non-versioned desktop files
-cd $DESTDIR/$INSTALLDIR/share/xdg
+#cd $DESTDIR/$INSTALLDIR/share/xdg
 # we want non-versioned stuff in the distro packages
-sed -i \
-    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-    *.desktop
-cd -
+#sed -i \
+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
+#    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
+#    *.desktop
+#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
-        find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand
+    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 \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand
     done
 fi