From c441fb73130f4c117094d7da4de9fe56f886e65d Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 21 Nov 2017 15:35:10 +0900 Subject: tests: Make portability fix. * lang/python/tests/Makefile.am: Distinguish target and path. * tests/gpg/Makefile.am: Ditto. * tests/gpgsm/Makefile.am: Ditto. -- GNU Make is powerful enough to match path to target (and vice versa), but BSD make is not. GnuPG-bug-id: 3056 Signed-off-by: NIIBE Yutaka --- lang/python/tests/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lang/python') diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am index beb5a309..25b15f2b 100644 --- a/lang/python/tests/Makefile.am +++ b/lang/python/tests/Makefile.am @@ -96,7 +96,7 @@ clean-local: BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \ private-keys-v1.d/gpg-sample.stamp -./private-keys-v1.d/gpg-sample.stamp: $(private_keys) +private-keys-v1.d/gpg-sample.stamp: $(private_keys) -gpgconf --kill all $(MKDIR_P) ./private-keys-v1.d for k in $(private_keys); do \ @@ -104,7 +104,7 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \ done echo x > ./private-keys-v1.d/gpg-sample.stamp -./pubring-stamp: $(test_srcdir)/pubdemo.asc \ +pubring-stamp: $(test_srcdir)/pubdemo.asc \ ./private-keys-v1.d/gpg-sample.stamp $(GPG) --batch --no-permission-warning \ --import $(test_srcdir)/pubdemo.asc @@ -112,12 +112,12 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \ --import $(test_srcdir)/secdemo.asc echo x > ./pubring-stamp -./gpg.conf: +gpg.conf: # This is required for t-sig-notations. echo no-force-v3-sigs > ./gpg.conf echo ignore-invalid-option agent-program >> ./gpg.conf echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpg.conf -./gpg-agent.conf: +gpg-agent.conf: # This is required for gpg2, which does not support command fd. echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@ -- cgit v1.2.3