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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Mar 13 17:23:42 UTC 2019


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

New commits:
commit 35f5c97bbb28aba47ca6f6c59d62b8c25f9daf3b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Mar 13 16:04:10 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Mar 13 18:23:15 2019 +0100

    Resolves: tdf#124023 target links.txt not updated
    
    when source links.txt changes
    
    Change-Id: I90e9b64fdd01ff725149cc6d07d3ea6c28b50156
    Reviewed-on: https://gerrit.libreoffice.org/69202
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 0ecd76d37035..5ad55799e1e1 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -23,7 +23,9 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
 $(packimages_DIR)/images.zip : DEFAULT_THEME := $(true)
 $(packimages_DIR)/images_%.zip : DEFAULT_THEME :=
 
-$(packimages_DIR)/%_links.txt :
+# tdf#124023 make links.txt depend on phony sorted.lst depend
+# so this is evaluated every time
+$(packimages_DIR)/%_links.txt : $(packimages_DIR)/sorted.lst
 	@if test -f "$(SRCDIR)/icon-themes/$*/links.txt"; then \
 		cp "$(SRCDIR)/icon-themes/$*/links.txt" $@.tmp ; \
 	else \


More information about the Libreoffice-commits mailing list