[Libreoffice-commits] .: packimages/CustomTarget_images.mk packimages/Package_images.mk

[Matus Kukan]

 packimages/CustomTarget_images.mk |    5 +++--
 packimages/Package_images.mk      |    6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 584c5f1d3530eec6c6bfa68a05533609a81cfb2f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Jun 3 11:24:03 2012 +0200

    packimages: better interpret 'default' value in WITH_THEMES
    
    Change-Id: Id68748b557f4ec5a28489ea894be221953ac9045

diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk
index 8b27653..5521694 100644
--- a/packimages/CustomTarget_images.mk
+++ b/packimages/CustomTarget_images.mk
@@ -35,8 +35,9 @@ packimages_CUSTOM_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango
 packimages_CUSTOM_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial
 
 $(call gb_CustomTarget_get_target,packimages/images) : \
-	$(packimages_DIR)/images.zip $(packimages_DIR)/images_brand.zip $(foreach theme,$(WITH_THEMES),\
-		$(packimages_DIR)/images_$(theme).zip)
+	$(packimages_DIR)/images_brand.zip \
+	$(if $(filter default,$(WITH_THEMES)),$(packimages_DIR)/images.zip) \
+	$(foreach theme,$(filter-out default,$(WITH_THEMES)),$(packimages_DIR)/images_$(theme).zip)
 
 $(packimages_DIR)/images.zip : \
 		$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
diff --git a/packimages/Package_images.mk b/packimages/Package_images.mk
index 9f7ee7b..a57c7e4 100644
--- a/packimages/Package_images.mk
+++ b/packimages/Package_images.mk
@@ -27,10 +27,12 @@
 
 $(eval $(call gb_Package_Package,packimages_images,$(call gb_CustomTarget_get_workdir,packimages/images)))
 
-$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip))
 $(eval $(call gb_Package_add_file,packimages_images,bin/images_brand.zip,images_brand.zip))
 
-$(foreach theme,$(WITH_THEMES),\
+$(if $(filter default,$(WITH_THEMES)),\
+$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip)))
+
+$(foreach theme,$(filter-out default,$(WITH_THEMES)),\
 $(eval $(call gb_Package_add_file,packimages_images,bin/images_$(theme).zip,images_$(theme).zip)))
 
 # vim: set noet sw=4 ts=4: