You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2023/03/10 19:38:52 UTC
[openoffice] branch trunk updated: Ensure compatibility with GNU Make 4.4 (#175)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ef6e816f0b Ensure compatibility with GNU Make 4.4 (#175)
ef6e816f0b is described below
commit ef6e816f0bb2fe7291d2ea7c6f3c877c71fe91b1
Author: Arrigo Marchiori <ar...@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.
---
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 $@