ooo-build r14517 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Nov 17 10:30:41 2008
New Revision: 14517
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14517&view=rev

Log:
2008-11-17  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-multi-lang-installer.diff: Merge from
	ooo-build-3-0.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-multi-lang-installer.diff

Modified: trunk/patches/dev300/win32-multi-lang-installer.diff
==============================================================================
--- trunk/patches/dev300/win32-multi-lang-installer.diff	(original)
+++ trunk/patches/dev300/win32-multi-lang-installer.diff	Mon Nov 17 10:30:41 2008
@@ -530,6 +530,5 @@
 -	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 +	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
  
- openofficedevarchive_% :
- 	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format archive $(VERBOSESWITCH)
-
+ .IF "$(PKGFORMAT)"!=""
+ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$ {$(PKGFORMAT:^".")}