[Libreoffice-commits] .: bin/package-ooo

[Petr Mladek]

 bin/package-ooo |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 28a318db1dda71cffad3ab5490f97b68585d5d2b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 30 14:41:56 2010 +0100

    Do not duplicate $OODESTDIR path
    
    Related to the commit bdf644224bfe0f14e658cc484c6b8f6aa6c73243
    Replace $OODESTDIR$PREFIX by $PREFIX; use $PREFIXBASE instead
    of /usr

diff --git a/bin/package-ooo b/bin/package-ooo
index b6afbd9..e4ae2b2 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -176,11 +176,11 @@ case $VENDORNAME in
         # Icons and menu stuff is handled in actions.py
         ;;
   *)
-	mkdir -p $OODESTDIR$PREFIX/share/applications
+	mkdir -p $PREFIX/share/applications
 	cd $TOOLSDIR/desktop
 	for source in *.desktop ; do
 	    dest=`echo $source | sed "s|.desktop\$||"`
-	    dest="$OODESTDIR$PREFIX/share/applications/$dest$BINSUFFIX.desktop"
+	    dest="$PREFIX/share/applications/$dest$BINSUFFIX.desktop"
 	    add_version=
 	    test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
 	    sed -e "s|\(^Name.*\)\$|\1$add_version|
@@ -188,7 +188,7 @@ case $VENDORNAME in
 	done
 
 	# icons
-	icondir=$PREFIX/share/icons/hicolor
+	icondir=$PREFIXBASE/share/icons/hicolor
 	for size in 16x16 22x22 24x24 32x32 48x48 scalable ; do
 	    mkdir -p $OODESTDIR$icondir/$size/apps
 	    cd $TOOLSDIR/desktop/$size/
@@ -202,7 +202,7 @@ case $VENDORNAME in
 	done
 
 	# create symlinks below share/pixmaps to keep the backward compatibility
-	pixmapsdir=$OODESTDIR$PREFIX/share/pixmaps
+	pixmapsdir=$PREFIX/share/pixmaps
 	mkdir -p $pixmapsdir
 	cd $OODESTDIR$icondir/48x48/apps
 	for icon in ooo-*.png ; do
@@ -210,9 +210,9 @@ case $VENDORNAME in
 	done
 	
 	# shared MIME info
-	mkdir -p $OODESTDIR$PREFIX/share/mime/packages
+	mkdir -p $PREFIX/share/mime/packages
 	cd $TOOLSDIR/desktop
-	cp openoffice.xml $OODESTDIR$PREFIX/share/mime/packages
+	cp openoffice.xml $PREFIX/share/mime/packages
 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
 	   which update-mime-database >/dev/null 2>&1 ; then
 	    update-mime-database /usr/share/mime || :