[Libreoffice-commits] .: Branch 'libreoffice-3-3' - desktop/zipintro

[Petr Mladek]

 desktop/zipintro/makefile.mk |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 3ded548895003d242e6afcabeb5b1532d1b2665c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jan 5 19:38:22 2011 +0100

    Fix distro specific about intro hadling
    
    oosplash does not longer support multiple intro pictures; it is enough
    to replace intro.png and about.png with the pictures passed via
    
    Signed off by KAMI.
    --with-intro-bitmap and --with-about-bitmap configure options

diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index d15f2de..cdc547f 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -33,11 +33,11 @@ TARGET=zipintro
 .INCLUDE :  settings.mk
 
 ZIP1LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS))
+    $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png \
+    $(MISC)$/$(RSCDEFIMG)$/brand$/about.png
 ZIP2LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS))
+    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png \
+    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png
 ZIP3LIST= \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \
@@ -90,3 +90,15 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
 $(MISC)$/%.png : $(SOLARSRC)$/%.png
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
+
+.IF "$(INTRO_BITMAP)" != ""
+$(MISC)$/$(RSCDEFIMG)$/brand$/intro.png : $(INTRO_BITMAP)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+.ENDIF
+
+.IF "$(ABOUT_BITMAP)" != ""
+$(MISC)$/$(RSCDEFIMG)$/brand$/about.png : $(ABOUT_BITMAP)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+.ENDIF