[openoffice] 01/01: Fix compatibility with GNU Make 4.4

[ardovm]

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

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

commit 231f3c14935fce2603132a0c1b221c751053ea86
Author: Arrigo Marchiori <ard...@yahoo.it>
AuthorDate: Sun Mar 5 14:58:31 2023 +0100

    Fix compatibility with GNU Make 4.4
    
    Change a pattern rule with multiple targets into multiple pattern rules
    with single targets.
    
    Also, correct an inessential whitespace.
---
 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..d2761c7edd 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 $@