Kaydet (Commit) 3b71964e authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

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/2235Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst f3929090
...@@ -45,7 +45,7 @@ $(packimages_DIR)/images.zip : \ ...@@ -45,7 +45,7 @@ $(packimages_DIR)/images.zip : \
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \ -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)) $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
$(packimages_DIR)/images_%.zip : \ $(packimages_DIR)/images_%.zip : \
...@@ -55,7 +55,7 @@ $(packimages_DIR)/images_%.zip : \ ...@@ -55,7 +55,7 @@ $(packimages_DIR)/images_%.zip : \
$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \ -m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \
$(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \ $(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)) $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
# make sure to have one to keep packing happy # make sure to have one to keep packing happy
......
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