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

[Jan Holesovsky]

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

New commits:
commit 43a082f0bba799a9fc33071079f7a42932935e05
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Jun 23 12:32:28 2015 +0200

    tdf#90790: Don't take galaxy as a reference icon set, it may be incomplete.
    
    Some icons in galaxy are available only via a fallback, while the other themes
    can implement these icons directly; but they did not end up in the
    images_*.zip.
    
    Change-Id: Ifc937ebec7a1e38828672e65706150f50abe8703

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index aba5afc..de2c21d 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -55,8 +55,9 @@ $(packimages_DIR)/%.zip : \
 $(packimages_DIR)/commandimagelist.ilst :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
-			sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
+		find $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \
+			grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | sort | uniq | \
+			sed "s#^#%MODULE%#" | \
 			LC_ALL=C sort > $@.tmp && \
 		$(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.tmp $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))