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

[Petr Mladek]

 bin/package-ooo |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0cf0c0db05295aa1cc1b7728183b9cbc57e37408
Author: Robert Nagy <robert at openbsd.org>
Date:   Fri Nov 19 12:30:25 2010 +0100

    Install to the correct directory based on PREFIX

diff --git a/bin/package-ooo b/bin/package-ooo
index f5d5c43..e88f8f0 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/usr/share/applications
+	mkdir -p $OODESTDIR$PREFIX/share/applications
 	cd $TOOLSDIR/desktop
 	for source in *.desktop ; do
 	    dest=`echo $source | sed "s|.desktop\$||"`
-	    dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop"
+	    dest="$OODESTDIR$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,31 +188,31 @@ case $VENDORNAME in
 	done
 
 	# icons
-	icondir=/usr/share/icons/hicolor
+	icondir=$PREFIX/share/icons/hicolor
 	for size in 16x16 22x22 24x24 32x32 48x48 scalable ; do
-	    mkdir -p $OODESTDIR/$icondir/$size/apps
+	    mkdir -p $OODESTDIR$icondir/$size/apps
 	    cd $TOOLSDIR/desktop/$size/
 	    # note that the scalable directory includes .svg icons
 	    for source in ooo-*.[ps][nv]g ; do
 		suffix=`echo $source | sed "s|^.*\(\.[ps][nv]g\)\$|\1|"`
 		dest=`echo $source | sed "s|$suffix\$||"`
-		dest="$OODESTDIR/$icondir/$size/apps/$dest$BINSUFFIX$suffix"
+		dest="$OODESTDIR$icondir/$size/apps/$dest$BINSUFFIX$suffix"
 		cp $source "$dest" || exit 1;
 	    done
 	done
 
 	# create symlinks below share/pixmaps to keep the backward compatibility
-	pixmapsdir=$OODESTDIR/usr/share/pixmaps
+	pixmapsdir=$OODESTDIR$PREFIX/share/pixmaps
 	mkdir -p $pixmapsdir
-	cd $OODESTDIR/$icondir/48x48/apps
+	cd $OODESTDIR$icondir/48x48/apps
 	for icon in ooo-*.png ; do
 	    ln -sf $icondir/48x48/apps/$icon $pixmapsdir
 	done
 	
 	# shared MIME info
-	mkdir -p $OODESTDIR/usr/share/mime/packages
+	mkdir -p $OODESTDIR$PREFIX/share/mime/packages
 	cd $TOOLSDIR/desktop
-	cp openoffice.xml $OODESTDIR/usr/share/mime/packages
+	cp openoffice.xml $OODESTDIR$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 || :