[Libreoffice-commits] core.git: postprocess/CustomTarget_images.mk

[Caolán McNamara]

 postprocess/CustomTarget_images.mk |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 484d75feb3518976434dfdb883d283c6fdca9c9f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 26 10:41:59 2013 +0100

    Related: fdo#63591 pack missing images referenced by .ui files
    
    Change-Id: Ibab8cbbfc6cc716f64aadec0ec97944a698c3874

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index ce3b25f..68156a1 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -65,14 +65,19 @@ $(packimages_DIR)/images_%.zip : \
 		$(packimages_DIR)/sorted.lst \
 		$(packimages_DIR)/commandimagelist.ilst \
 		$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
-		$(call gb_Postprocess_get_target,AllResources)
+		$(call gb_Postprocess_get_target,AllResources) \
+		$(call gb_Postprocess_get_target,AllUIConfigs)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
 			-m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \
 			$(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \
 			$(call gb_Helper_optional,HELP,-l $(helpimages_DIR) ) \
-			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \
+			-l $(packimages_DIR) \
+			-l $(dir $(call gb_ResTarget_get_imagelist_target)) \
+			-l $(dir $(call gb_UIConfig_get_imagelist_target)) \
+			-l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \
+			-s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 # make sure to have one to keep packing happy