diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-03 11:24:03 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-03 14:39:04 +0200 |
| commit | 584c5f1d3530eec6c6bfa68a05533609a81cfb2f (patch) | |
| tree | 2e7bac90223d6eb39f1c61e0edb66680eb727c59 /packimages | |
| parent | 44e3dcf03b74111965584feb22e7baf97e26a7fa (diff) | |
packimages: better interpret 'default' value in WITH_THEMES
Change-Id: Id68748b557f4ec5a28489ea894be221953ac9045
Diffstat (limited to 'packimages')
| -rw-r--r-- | packimages/CustomTarget_images.mk | 5 | ||||
| -rw-r--r-- | packimages/Package_images.mk | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk index 8b27653ff8f0..5521694dc7b7 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 9f7ee7b46567..a57c7e4a2d0a 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: |