You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by da...@apache.org on 2018/11/25 13:28:21 UTC

svn commit: r1847407 - /openoffice/trunk/main/solenv/gbuild/Ant.mk

Author: damjan
Date: Sun Nov 25 13:28:21 2018
New Revision: 1847407

URL: http://svn.apache.org/viewvc?rev=1847407&view=rev
Log:
Fix building with GNU make versions below 4.2,
which lack:
$(file < ...)
but have:
$(shell cat ...)
instead.

Patch by: me


Modified:
    openoffice/trunk/main/solenv/gbuild/Ant.mk

Modified: openoffice/trunk/main/solenv/gbuild/Ant.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Ant.mk?rev=1847407&r1=1847406&r2=1847407&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Ant.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Ant.mk Sun Nov 25 13:28:21 2018
@@ -67,7 +67,7 @@ $(call gb_Deliver_add_deliverable,$(call
 $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
 
 __ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
-$$(eval $(foreach dep,$(file < $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+$$(eval $(foreach dep,$(shell cat < $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
 
 endef