[Libreoffice-commits] .: instsetoo_native/util

[Lubos Lunak]

 instsetoo_native/util/makefile.mk |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 1af8860fd112f51b18b334ab041b73eba6095dbb
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Oct 12 14:14:36 2010 +0200

    do not reference non-existent branding files

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index aafb69f..5f18a52 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -156,17 +156,12 @@ MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
 .ELSE			# "$(BUILD_SPECIAL)"!=""
 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) \
-    $(BROFFICENOLOGOBRAND) $(BROFFICEDEVNOLOGOBRAND)
+ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
 .IF "$(OS)" == "WNT"
 ADDDEPS+=hack_msitemplates
 .ENDIF
@@ -286,10 +281,10 @@ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewi
 $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
     @$(COPY) $< $@
 
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
+$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand$/intro.zip
     $(COPY) $< $@
 
-$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
+$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
     @-$(MKDIR) $(@:d)
     $(COPY) $< $@
 
@@ -297,10 +292,6 @@ $(BIN)$/broffice_dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_dev_nologo$/int
     @-$(MKDIR) $(@:d)
     $(COPY) $< $@
 
-$(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
-    @-$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
 $(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
     @-$(MKDIR) $(@:d)
     $(COPY) $< $@