[openoffice] branch AOO42X updated: Ensure compatibility with GNU Make 4.4 (#175)

[ardovm]

This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new e189e7f1ba Ensure compatibility with GNU Make 4.4 (#175)
e189e7f1ba is described below

commit e189e7f1baeee91bebe78df7a56c3b13c22b73da
Author: Arrigo Marchiori <ard...@yahoo.it>
AuthorDate: Fri Mar 10 20:38:46 2023 +0100

    Ensure compatibility with GNU Make 4.4 (#175)
    
    Change a pattern rule with multiple targets into multiple pattern rules
    with single targets.
    
    Also, correct an inessential whitespace.
    
    (cherry picked from commit ef6e816f0bb2fe7291d2ea7c6f3c877c71fe91b1)
---
 main/solenv/gbuild/Package.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/solenv/gbuild/Package.mk b/main/solenv/gbuild/Package.mk
index 7e689a3032..40f57af9e0 100644
--- a/main/solenv/gbuild/Package.mk
+++ b/main/solenv/gbuild/Package.mk
@@ -24,8 +24,15 @@
 
 # PackagePart class
 
-$(foreach destination,$(call gb_PackagePart_get_destinations), 
$(destination)/%) :
-       $(call gb_Deliver_deliver,$<,$@)
+define gb_PackagePart_deliver_destination
+$(1)/% :
+       $$(call gb_Deliver_deliver,$$<,$$@)
+
+endef
+
+$(foreach destination,$(call gb_PackagePart_get_destinations),$(eval $(call 
gb_PackagePart_deliver_destination,$(destination))))
+
+
 
 define gb_PackagePart_PackagePart
 $(OUTDIR)/$(1) : $(2)
@@ -41,7 +48,7 @@ $(call gb_Package_get_clean_target,%) :
        $(call gb_Output_announce,$*,$(false),PKG,2)
        RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
        && cat $${RESPONSEFILE} | xargs rm -f \
-       && rm -f $${RESPONSEFILE}
+       && rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :
        mkdir -p $(dir $@) && touch $@