[Libreoffice-commits] core.git: Branch 'aoo/trunk' - packimages/Package_packimages.mk

Thu Feb 14 07:08:38 UTC 2019

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

New commits:
commit 7c99d22b2b7a1b93b9bc42a18bd7c2a3d0241188
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Thu Feb 14 05:55:10 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Thu Feb 14 05:55:10 2019 +0000

    Fix a regression in 1853299 caused by a path and pattern match rule
    
    in main/packages that were wrong.
    
    Patch by: me

diff --git a/packimages/Package_packimages.mk b/packimages/Package_packimages.mk
index 6cebd5861ac7..2c6e8deaa508 100644
--- a/packimages/Package_packimages.mk
+++ b/packimages/Package_packimages.mk
@@ -53,10 +53,10 @@ $(WORKDIR)/CustomTarget/packimages/bin/images.zip : $(COMMAND_IMAGE_LIST)
 		-c $(SRCDIR)/packimages \
 		-l $(OUTDIR)/res/img \
 		-s $(SORTED_LIST) \
-		-l $(OUTDIR)/res/img \
+		-l $(WORKDIR)/CustomTarget/packimages/res/img \
 		-o $@
 
-$(WORKDIR)/CustomTarget/packimages/bin/images_% : $(COMMAND_IMAGE_LIST)
+$(WORKDIR)/CustomTarget/packimages/bin/images_%.zip : $(COMMAND_IMAGE_LIST)
 	mkdir -p $(dir $@) && \
 	$(PERL) $(SOLARENV)/bin/packimages.pl \
 		$(VERBOSESWITCH) \
