diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-08-30 22:31:08 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@edx.srv.br> | 2016-11-04 13:42:09 +0000 |
| commit | d082936c7a2c3fd6a8784fa5a626f545ec904b42 (patch) | |
| tree | 0cfdbcc3b7d34e02f559765fe7f5e19786755b8f /postprocess | |
| parent | cae6864374975dabe93b95fad9161bab84454b99 (diff) | |
Allow including/packaging help-specific images
from other than icon-themes folder
Change-Id: Iba1808e642fde8d0370b59550c7bdac1a3e4ac79
Reviewed-on: https://gerrit.libreoffice.org/28513
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index ecfbe963a5da..def511bc4940 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -30,6 +30,7 @@ $(packimages_DIR)/%.zip : \ $(SRCDIR)/sfx2/source/sidebar/sidebar.ilst \ $(SRCDIR)/vcl/source/control/throbber.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ + $(call gb_Helper_optional,HELP,$(helpimages_DIR)/screenshotimg.ilst) \ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Helper_get_imagelists) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) @@ -41,6 +42,7 @@ $(packimages_DIR)/%.zip : \ -g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \ ) \ $(INDUSTRIAL_FALLBACK) \ + $(call gb_Helper_optional,HELP,-e $(SRCDIR)/helpcontent2/source) \ -l $${ILSTFILE} \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ |