diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-08-22 13:36:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-08-22 14:09:15 +0200 |
| commit | 0bcefcabdd86b11810b64d1166cfb2386717367b (patch) | |
| tree | 79c039fb3eb4a523811611677b458dc92dc1d1c3 /postprocess | |
| parent | 7524f45e0a2b86dc418f0eb76df89dbdbecfafd3 (diff) | |
remove special casing for obsoleted default theme
Change-Id: I6688251eac8ecb5ea671cae281c2445df773be16
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 3 | ||||
| -rw-r--r-- | postprocess/Package_images.mk | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index e66a015b75a6..cbc9cef79090 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -18,8 +18,7 @@ helpimages_DIR := $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxilia packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c $(SRCDIR)/icon-themes/industrial $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\ - $(if $(filter default,$(WITH_THEMES)),images.zip) \ - $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ + $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \ commandimagelist.ilst \ sorted.lst \ )) diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk index 66fb0cdbc4b8..54cb84eadb45 100644 --- a/postprocess/Package_images.mk +++ b/postprocess/Package_images.mk @@ -10,8 +10,7 @@ $(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images))) $(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\ - $(if $(filter default,$(WITH_THEMES)),images.zip) \ - $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ + $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \ )) # vim: set noet sw=4 ts=4: |