ooo-build r14532 - in trunk: . bin

[szalaik svn gnome org]

Author: szalaik
Date: Tue Nov 18 15:02:11 2008
New Revision: 14532
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14532&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:
   trunk/ChangeLog
   trunk/bin/localize-ooo
   trunk/configure.in

Modified: trunk/bin/localize-ooo
==============================================================================
--- trunk/bin/localize-ooo	(original)
+++ trunk/bin/localize-ooo	Tue Nov 18 15:02:11 2008
@@ -84,6 +84,8 @@
 # lang-specific sdf files
 extra_trans_lang_list=$stamp_dir/build.extra.translations.lang.list
 
+test "$VENDORNAME" = "OxygenOffice" && rm -rf "$extra_trans_stamp"
+
 # call grep only once to speed up the search from 22s to 2s
 all_langs_pattern=`mktemp /tmp/localize-ooo-XXXXXX`
 for lang in $ALL_LANGS ; do

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov 18 15:02:11 2008
@@ -595,6 +595,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])