2008-01-10 Marcus Brinkmann <marcus@g10code.de>

	* gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path.

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index 3219aa787bf69b156d68634e5252b6d54a4cebc7..d63ca03884e8e0f258f9d672299bc4cfc26f885f 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-10  Marcus Brinkmann  <marcus@g10code.de>
 
+       * gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path.
+
        * gpg/pinentry: New file.
        * gpg/Makefile.am (DISTCLEANFILES, all-local): Add gpg-agent.conf
        (./gpg-agent.conf): New target.

diff --git a/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
index af0fa5f1d98078f1ee5688c5fad864cee0b914bc..3ae4d862dfce5f20bdcc1c15c150566077accac3 100644 (file)
--- a/trunk/tests/gpg/Makefile.am
+++ b/trunk/tests/gpg/Makefile.am
@@ -71,4 +71,4 @@ all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
 
 ./gpg-agent.conf:
 # This is required for gpg2, which does not support command fd.
-       echo pinentry-program $(abs_builddir)/pinentry > ./gpg-agent.conf
+       echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf