ooo-build r14531 - in branches/ooo-build-3-0: . bin

[szalaik svn gnome org]

Author: szalaik
Date: Tue Nov 18 14:56:42 2008
New Revision: 14531
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14531&view=rev

Log:
2008-11-18  Kalman Szalai - KAMI <kamihir freemail hu>

	* bin/localize-ooo: Always merge additional translations
	for OxygenOffice.

	* configure.in: Added OxygenOffice and FSFhu as a Vendor.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/localize-ooo
   branches/ooo-build-3-0/configure.in

Modified: branches/ooo-build-3-0/bin/localize-ooo
==============================================================================
--- branches/ooo-build-3-0/bin/localize-ooo	(original)
+++ branches/ooo-build-3-0/bin/localize-ooo	Tue Nov 18 14:56:42 2008
@@ -22,9 +22,13 @@
 
 # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
 # already merged?
+
 extra_trans_stamp=$TOOLSDIR/stamp/build.extra.translations
 extra_trans=`find $SRCDIR -name "GSI_*.sdf"`
 extra_trans_langs=
+
+test "$VENDORNAME" = "OxygenOffice" && rm -rf "$extra_trans_stamp"
+
 for file in $extra_trans ; do
     # skip this localization if it is already merged
     grep -q "^$file$" $extra_trans_stamp 2>/dev/null && continue;

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Tue Nov 18 14:56:42 2008
@@ -579,6 +579,8 @@
         rPath*|rpl*) VENDORNAME="rPath" ;;
         SUSE*|Novell*|NLD*|GoOo*) VENDORNAME="Novell" ;;
         PLD*) VENDORNAME="PLD" ;;
+        OxygenOffice*) VENDORNAME="OxygenOffice" ;;
+        FSFhu*) VENDORNAME="FSFhu" ;;
         *) AC_MSG_WARN([Cannot guess vendor from distro - please add it to configure.in]) ;;
 esac
 AC_MSG_RESULT([$VENDORNAME])