Skip to content

C
core
Kaydet (Commit) 584c5f1d authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

packimages: better interpret 'default' value in WITH_THEMES 

Change-Id: Id68748b557f4ec5a28489ea894be221953ac9045
üst 44e3dcf0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
packimages/CustomTarget_images.mk
Dosyayı görüntüle @ 584c5f1d
......@@ -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
......
packimages/Package_images.mk
Dosyayı görüntüle @ 584c5f1d
......@@ -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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment