From 875a1bf2e132e9083f3cf23b0fc59aeedaf61574 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sun, 5 May 2024 19:20:33 +0200 Subject: makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …by a simple/static $(gb_UnpackedTarball_workdir)/foo see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163 Reviewed-by: Christian Lohmaier Tested-by: Jenkins --- external/liborcus/Library_orcus-parser.mk | 4 ++-- external/liborcus/Library_orcus.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'external/liborcus') diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk index b7b459f36b7f..ef1393a998d1 100644 --- a/external/liborcus/Library_orcus-parser.mk +++ b/external/liborcus/Library_orcus-parser.mk @@ -24,8 +24,8 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser)) $(eval $(call gb_Library_set_precompiled_header,orcus-parser,external/liborcus/inc/pch/precompiled_orcus-parser)) $(eval $(call gb_Library_set_include,orcus-parser,\ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ + -I$(gb_UnpackedTarball_workdir)/liborcus/include \ + -I$(gb_UnpackedTarball_workdir)/liborcus/src/include \ $$(INCLUDE) \ )) diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk index 28ef13612260..7a138e11d925 100644 --- a/external/liborcus/Library_orcus.mk +++ b/external/liborcus/Library_orcus.mk @@ -25,8 +25,8 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus)) $(eval $(call gb_Library_set_precompiled_header,orcus,external/liborcus/inc/pch/precompiled_orcus)) $(eval $(call gb_Library_set_include,orcus,\ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ + -I$(gb_UnpackedTarball_workdir)/liborcus/include \ + -I$(gb_UnpackedTarball_workdir)/liborcus/src/include \ $$(INCLUDE) \ )) -- cgit