[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/buildfix-instsetoo_native-archive.diff      |    2 +-
 patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80c215b48b187de0741b66e123622c00ac1f6171
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Mon Mar 7 07:24:08 2011 +0100

    Fix buildfix patches - OxygenOffice introduction

diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff b/patches/dev300/buildfix-instsetoo_native-archive.diff
index 95f67a7..61e9155 100644
--- a/patches/dev300/buildfix-instsetoo_native-archive.diff
+++ b/patches/dev300/buildfix-instsetoo_native-archive.diff
@@ -75,4 +75,4 @@
 +broolanguagepack_%{$(PKGFORMAT:^".") .archive} :
      +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
  
- .ELSE			# "$(alllangiso)"!=""
+ $(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
diff --git a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
index 466d8a0..0cdc4fd 100644
--- a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
+++ b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
@@ -16,4 +16,4 @@ diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.
 +.ENDIF
  
  .IF "$(LOCALPYFILES)"!=""
- $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)