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

[Bjoern Michaelsen]

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

New commits:
commit 3b71964eabc9d402d2449566bbd4817e149580b4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Feb 18 13:34:38 2013 +0100

    seed packimages from SRCDIR instead of OURDIR (fix build breaker)
    
    - in the long run we should likely either move packimages to icon-themes
      or the icon-themes to postprocess to have them together
    
    Change-Id: I4d0d9d4035600191bb16565efb8756aab2a447c2
    Reviewed-on: https://gerrit.libreoffice.org/2235
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 73dd16e..fdece97 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -45,7 +45,7 @@ $(packimages_DIR)/images.zip : \
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
 			-m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \
-			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(OUTDIR)/res/img -s $< -o $@ \
+			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(SRCDIR)/icon-themes/ -s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 $(packimages_DIR)/images_%.zip : \
@@ -55,7 +55,7 @@ $(packimages_DIR)/images_%.zip : \
 		$(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) \
-			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(OUTDIR)/res/img -s $< -o $@ \
+			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(SRCDIR)/icon-themes/ -s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 # make sure to have one to keep packing happy