summaryrefslogtreecommitdiff
path: root/desktop/zipintro/makefile.mk
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2011-01-05 19:38:22 +0100
committerPetr Mladek <pmladek@suse.cz>2011-01-07 18:40:26 +0100
commit18e2b6173baecd1c24afdd8ccb3eb9e3ce8235b3 (patch)
tree506a9b10d891771e350f00044fbfa8d7e794779a /desktop/zipintro/makefile.mk
parentf795718d498e939e4a0b4db6f17963ffc68fb792 (diff)
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
Diffstat (limited to 'desktop/zipintro/makefile.mk')
-rw-r--r--desktop/zipintro/makefile.mk20
1 files changed, 16 insertions, 4 deletions
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index d15f2deafe45..cdc547fcc5c7 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