ooo-build r14224 - in trunk: . bin

[ccheney svn gnome org]

Author: ccheney
Date: Mon Oct  6 20:18:15 2008
New Revision: 14224
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14224&view=rev

Log:
2008-10-06  Chris Cheney  <ccheney ubuntu com>

        * bin/package-ooo: Updated to work with binsuffix again.


Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Oct  6 20:18:15 2008
@@ -101,7 +101,7 @@
 #       you cannot include this link directly into the package
 #       For example, the Novell package mark this symlink as %ghost
 #	and update it in %post and %postun
-ln -sf $OOINSTBASE/program/soffice $PREFIX/bin/soffice
+ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
 
 # no man-page so ...
 if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
@@ -908,12 +908,12 @@
         if [ -e gid_Module_Optional_Pymailmerge ]; then
 		create_package_directory gid_Module_Optional_Pymailmerge	pkg/openoffice.org-emailmerge
 	else # post m26
-		mkdir -p pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/program
-		mv pkg/openoffice.org-common/usr/lib/openoffice/basis$VERSION/program/mailmerge.py \
-			pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/program/mailmerge.py
-		mkdir -p pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer
-		mv pkg/openoffice.org-common/usr/lib/openoffice/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu \
-			pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+		mkdir -p pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/program
+		mv pkg/openoffice.org-common/$OOINSTBASE/basis$VERSION/program/mailmerge.py \
+			pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/program/mailmerge.py
+		mkdir -p pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer
+		mv pkg/openoffice.org-common/$OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu \
+			pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
 	fi
 
 	create_package_directory gid_Module_Root_SDK                    pkg/openoffice.org-dev