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

New commits:
commit 76635096e9c9832d856e8eb1798ce70256f6d81b
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Feb 23 08:43:00 2018 +0100

    Adapt CustomTarget_helpcontent2/source/auxiliary
    
    ...to core 906a2e4fa4e9ce231126c608e741c0c0d809157d "Always execute
    pack_images.py with the right Python interpreter"
    
    Change-Id: I7c6c9aed33222fb5b902e30a05cefe8f88c66df1

diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index f0710e682..099bebe10 100644
--- a/CustomTarget_imagelist.mk
+++ b/CustomTarget_imagelist.mk
@@ -19,11 +19,12 @@ $(eval $(call 
gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\
 
 $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : 
\
                $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \
-               $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst
+               $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst \
+               | $(call gb_ExternalExecutable_get_dependencies,python)
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
        $(call gb_Helper_abbreviate_dirs, \
                ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter 
%.ilst,$^)) && \
-               $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \
+               $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/solenv/bin/pack_images.py \
                        -g $(helpmedia_DIR) -m $(helpmedia_DIR) -c 
$(helpmedia_DIR) \
                        -l $${ILSTFILE} \
                        -s $< -o $@ \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to