diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-03-08 13:56:55 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-03-08 13:56:55 +0100 |
| commit | 38319486b74c616154dfc278f885dc4294ebb9ae (patch) | |
| tree | db5bc8db391014cb29bebb545a7e840bccd9dcf0 /instsetoo_native | |
| parent | 642b89e8fedf1e10c8986f7b5398f565f44c224f (diff) | |
do not create OxygeOffice rpms for LibreOffice build
there was a cut&paste problem in the previous commit
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 02dd229543ef..7951ff671ae6 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -319,11 +319,11 @@ oxygenofficewithjre_%{$(PKGFORMAT:^".")} : $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")} -ooolanguagepack_%{$(PKGFORMAT:^".")} : +oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} : $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH) $(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")} -ooohelppack_%{$(PKGFORMAT:^".")} : +oxygenofficehelppack_%{$(PKGFORMAT:^".")} : $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH) .ELSE # "$(alllangiso)"!="" |