diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 16:01:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 16:01:04 +0000 |
| commit | abc5392f4b4b0a859e40014f7793c5eb226b9d93 (patch) | |
| tree | 0b16f7f7ca841533baedd8e2c3dde03770537553 /instsetoo_native | |
| parent | be376e53cd0e7303efa083d64510f732a1c4f60a (diff) | |
INTEGRATION: CWS vcl87 (1.84.2); FILE MERGED
2008/03/17 11:44:01 pl 1.84.2.1: #i86904# no logo images.zip (thanks ause)
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index e11f46dfd824..901877dfd6a1 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.85 $ +# $Revision: 1.86 $ # -# last change: $Author: vg $ $Date: 2008-03-18 12:48:31 $ +# last change: $Author: kz $ $Date: 2008-04-03 17:01:04 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -167,6 +167,7 @@ MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) .ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.zip +NOLOGOIMAGES:=$(BIN)$/images.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip BROFFICENOLOGOSPLASH:=$(BIN)$/broffice$/intro.zip BROFFICEDEVNOLOGOSPLASH:=$(BIN)$/broffice_dev$/intro.zip @@ -175,7 +176,7 @@ MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates -ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) +ADDDEPS=$(NOLOGOIMAGES) $(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) .IF "$(OS)" == "WNT" ADDDEPS+=hack_msitemplates .ENDIF @@ -368,6 +369,9 @@ $(BIN)$/iso8859_1.py : @echo "Using system python - nothing more to do here" .ENDIF +$(BIN)$/images.zip : $(SOLARCOMMONBINDIR)$/nologo$/images.zip + $(COPY) $< $@ + $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip $(COPY) $< $@ |