diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 10:24:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 10:24:14 +0000 |
| commit | a043097fb154d598ae56391950537329c69eec82 (patch) | |
| tree | 4562e27fc5a03fabbf7ff7c732b6174cadf01d4d /desktop | |
| parent | 0771a3fec0ecf975334c68b882583ffe1447c03d (diff) | |
INTEGRATION: CWS brofficenologo (1.3.26); FILE MERGED
2007/08/01 15:27:21 pb 1.3.26.1: fix: #i79919# nologo broffice added
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/zipintro/makefile.mk | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index f8adc499eab1..5a2622c0d9a7 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hjs $ $Date: 2007-06-25 11:57:21 $ +# last change: $Author: hr $ $Date: 2007-08-03 11:24:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ TARGET=zipintro .INCLUDE : settings.mk -DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice intro +DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice nologo_dev_broffice intro ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ @@ -61,6 +61,12 @@ ZIP5LIST= \ ZIP6LIST= \ $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) +ZIP7LIST= \ + $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) +ZIP8LIST= \ + $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) ZIP1TARGET=dev_intro @@ -74,6 +80,10 @@ ZIP5TARGET=dev_broffice_intro ZIP6TARGET=broffice_intro +ZIP7TARGET=nologo_broffice_intro + +ZIP8TARGET=nologo_dev_broffice_intro + .INCLUDE : target.mk ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip) @@ -100,9 +110,18 @@ $(COMMONBIN)$/broffice$/intro.zip : $(COMMONBIN)$/broffice_intro.zip @$(COPY) $< $@ $(COMMONBIN)$/dev_broffice$/intro.zip : $(COMMONBIN)$/dev_broffice_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ + @@-$(MKDIR) $(@:d) + @$(COPY) $< $@ + +$(COMMONBIN)$/nologo_broffice$/intro.zip : $(COMMONBIN)$/nologo_broffice_intro.zip + @@-$(MKDIR) $(@:d) + @$(COPY) $< $@ + +$(COMMONBIN)$/nologo_dev_broffice$/intro.zip : $(COMMONBIN)$/nologo_dev_broffice_intro.zip + @@-$(MKDIR) $(@:d) + @$(COPY) $< $@ $(COMMONBIN)$/intro$/intro.zip : $(COMMONBIN)$/intro_intro.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ + |