diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-05 19:20:33 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-06 11:40:45 +0200 |
| commit | 875a1bf2e132e9083f3cf23b0fc59aeedaf61574 (patch) | |
| tree | e0aaa2967914dc9d1ece2055d4dfe3805982b41e /xmlsecurity | |
| parent | 971db10d73a0fe80cceca70d19edd02de30be414 (diff) | |
makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)
…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 <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 4a616cf18deb..4dc5b9dd226c 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\ -I$(SRCDIR)/xmlsecurity/inc \ -I$(SRCDIR)/xmlsecurity/source/gpg \ -I$(SRCDIR)/xmlsecurity/source/xmlsec \ - -I$(call gb_UnpackedTarball_get_dir,xmlsec/include) \ + -I$(gb_UnpackedTarball_workdir)/xmlsec/include \ )) $(eval $(call gb_Library_use_custom_headers,xsec_xmlsec,\ @@ -93,8 +93,8 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ )) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscng.lib \ - $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \ + $(gb_UnpackedTarball_workdir)/xmlsec/win32/binaries/libxmlsec-mscng.lib \ + $(gb_UnpackedTarball_workdir)/xmlsec/win32/binaries/libxmlsec.lib \ )) $(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ @@ -132,7 +132,7 @@ else # !$(OS),WNT ifeq ($(SYSTEM_XMLSEC),) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \ + $(gb_UnpackedTarball_workdir)/xmlsec/src/.libs/libxmlsec1.a \ )) endif @@ -140,7 +140,7 @@ ifeq ($(ENABLE_NSS),TRUE) ifeq ($(SYSTEM_XMLSEC),) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ + $(gb_UnpackedTarball_workdir)/xmlsec/src/nss/.libs/libxmlsec1-nss.a \ )) endif |