From d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Sun, 18 Mar 2018 11:25:41 +0100 Subject: properly check for gpgconf (and --create-socketdir) working Change-Id: I21268e5950381845eb90bf66a42a99adc3821eaa Reviewed-on: https://gerrit.libreoffice.org/51493 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xmlsecurity/CppunitTest_xmlsecurity_signing.mk') diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index 747ffdd7041b..2f3ed41e2dfb 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -59,14 +59,16 @@ $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ EXTRA_ENV_VARS := \ LIBO_LD_PATH=$$LD_LIBRARY_PATH +ifneq (,$(HAVE_GPGCONF_SOCKETDIR)) # create socket dir below /run/user/ instead of in workdir .PHONY : gb_CppunitTest_run_gpgconf gb_CppunitTest_run_gpgconf: GNUPGHOME=$(WORKDIR)/CppunitTest/xmlsecurity_signing.test.user \ - gpgconf --create-socketdir 2>/dev/null || true + $(GPGCONF) --create-socketdir $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ gb_CppunitTest_run_gpgconf endif +endif # vim: set noet sw=4 ts=4: -- cgit