diff options
| author | Kalman Szalai - KAMI <kami911@gmail.com> | 2011-03-07 07:24:08 +0100 |
|---|---|---|
| committer | Kalman Szalai - KAMI <kami911@gmail.com> | 2011-03-07 09:19:57 +0100 |
| commit | 80c215b48b187de0741b66e123622c00ac1f6171 (patch) | |
| tree | 9ed35630314cd80950f95343f2db592a71847d07 | |
| parent | 64167296e8821a045c77250776ba6aee8c2f8ef7 (diff) | |
Fix buildfix patches - OxygenOffice introduction
| -rw-r--r-- | patches/dev300/buildfix-instsetoo_native-archive.diff | 2 | ||||
| -rw-r--r-- | patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff b/patches/dev300/buildfix-instsetoo_native-archive.diff index 95f67a70c..61e91553c 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 466d8a0b3..0cdc4fd0c 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) |