diff options
Diffstat (limited to 'instsetoo_native/util/makefile.mk')
-rw-r--r-- | instsetoo_native/util/makefile.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 09334fdc98c0..b2f014f6ad58 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -157,13 +157,16 @@ MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip BROFFICENOLOGOSPLASH:=$(BIN)$/broffice$/intro.zip +BROFFICENOLOGOBRAND:=$(BIN)$/broffice$/images_brand.zip BROFFICEDEVNOLOGOSPLASH:=$(BIN)$/broffice_dev$/intro.zip +BROFFICENDEVOLOGOBRAND:=$(BIN)$/broffice_dev$/images_brand.zip MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates -ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) +ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) \ + $(BROFFICENOLOGOBRAND) $(BROFFICEDEVNOLOGOBRAND) .IF "$(OS)" == "WNT" ADDDEPS+=hack_msitemplates .ENDIF @@ -198,11 +201,6 @@ $(MAKETARGETS) : $(ADDDEPS) .ENDIF # "$(BUILD_SPECIAL)"!="" -.IF "$(OS)" == "MACOSX" -DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} -$(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS) -.ENDIF # "$(OS)" == "MACOSX" - $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")} .IF "$(MAKETARGETS)"!="" .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" @@ -314,8 +312,9 @@ $(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip @-$(MKDIR) $(@:d) $(COPY) $< $@ -$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} : $(PRJ)$/res$/$$(@:f) - @$(COPY) $< $@ +$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip + @-$(MKDIR) $(@:d) + $(COPY) $< $@ hack_msitemplates .PHONY: -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR) |