diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 12:43:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 12:43:08 +0000 |
| commit | 2b45fd7341581b7b07b53b1f17411069e479eea1 (patch) | |
| tree | f9fc3c7e015b29cd9c84ff8e950c5c528aecc10f /desktop | |
| parent | d47a29e1e87f1582d14c4009396ff159b072fbdc (diff) | |
INTEGRATION: CWS ause095 (1.5.76); FILE MERGED
2008/07/10 16:45:32 hjs 1.5.76.2: #i81251# - copy images before packling on nodep=treu
2008/06/27 14:58:01 hjs 1.5.76.1: #i81251# - fix absolute path in dependencies
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/zipintro/makefile.mk | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index cde0a67de1ce..70e5c801b9f4 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -40,45 +40,53 @@ TARGET=zipintro 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)) \ - $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) ZIP2LIST= \ - $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) ZIP3LIST= \ - $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) ZIP4LIST= \ - $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/$(RSCDEFIMG)$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) ZIP5LIST= \ - $(null,$(INTRO_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(SOLARSRC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) 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)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/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)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/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)) + $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) ZIP1TARGET=dev_intro +ZIP1DEPS=$(ZIP1LIST) ZIP2TARGET=dev_nologo_intro +ZIP2DEPS=$(ZIP2LIST) ZIP3TARGET=nologo_intro +ZIP3DEPS=$(ZIP3LIST) ZIP4TARGET=intro_intro +ZIP4DEPS=$(ZIP4LIST) ZIP5TARGET=dev_broffice_intro +ZIP5DEPS=$(ZIP5LIST) ZIP6TARGET=broffice_intro +ZIP6DEPS=$(ZIP6LIST) ZIP7TARGET=nologo_broffice_intro +ZIP7DEPS=$(ZIP7LIST) ZIP8TARGET=nologo_dev_broffice_intro +ZIP8DEPS=$(ZIP8LIST) .INCLUDE : target.mk @@ -121,3 +129,7 @@ $(COMMONBIN)$/intro$/intro.zip : $(COMMONBIN)$/intro_intro.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ +$(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + |