diff options
| author | Moritz Schulte <[email protected]> | 2009-04-19 18:03:49 +0000 |
|---|---|---|
| committer | Moritz Schulte <[email protected]> | 2009-04-19 18:03:49 +0000 |
| commit | edf19bbf8f644f8a0553bde0cc4e8ad3855d1a0e (patch) | |
| tree | d14272d6650244bafa9b798e67e2d6bdcbce07df | |
| parent | 2009-04-15 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-edf19bbf8f644f8a0553bde0cc4e8ad3855d1a0e.tar.gz gpgme-edf19bbf8f644f8a0553bde0cc4e8ad3855d1a0e.zip | |
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.
* gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
(mkdemodirs): New target.
(clean-local): Added command for removing mkdemodirs script.
(./Alpha/Secret.gpg): Added dependency on mkdemodirs.
* gpg/mkdemodirs: Renamed to ...
* gpg/mkdemodirs.in: ... here.
* gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | tests/ChangeLog | 11 | ||||
| -rw-r--r-- | tests/gpg/Makefile.am | 15 | ||||
| -rwxr-xr-x | tests/gpg/mkdemodirs.in (renamed from tests/gpg/mkdemodirs) | 2 |
5 files changed, 29 insertions, 7 deletions
@@ -1,3 +1,7 @@ +2009-04-19 Moritz <[email protected]> + + * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg. + 2009-03-06 Marcus Brinkmann <[email protected]> * assuan/: Update to libassuan SVN 2009-03-06. diff --git a/Makefile.am b/Makefile.am index d22ceaec..3201aeca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am - Top level Makefile for GPGME. # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH +# Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009 g10 Code GmbH # # This file is part of GPGME. # @@ -22,6 +22,8 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = dist-bzip2 +DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@" + EXTRA_DIST = gpgme.spec.in autogen.sh if BUILD_ASSUAN diff --git a/tests/ChangeLog b/tests/ChangeLog index 027afccf..154de99d 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,14 @@ +2009-04-19 Moritz <[email protected]> + + * gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in. + (mkdemodirs): New target. + (clean-local): Added command for removing mkdemodirs script. + (./Alpha/Secret.gpg): Added dependency on mkdemodirs. + + * gpg/mkdemodirs: Renamed to ... + * gpg/mkdemodirs.in: ... here. + * gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg". + 2009-02-24 Werner Koch <[email protected]> * opassuan/t-command.c: Adjust for changed new op_assuan interface. diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 3588d39e..57e53132 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -1,5 +1,5 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2004, 2005 g10 Code GmbH +# Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH # # This file is part of GPGME. # @@ -40,7 +40,7 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf -EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ +EXTRA_DIST = mkdemodirs.in pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ geheim.txt pubkey-1.asc seckey-1.asc pinentry INCLUDES = -I$(top_builddir)/src @@ -52,8 +52,13 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la # We don't run t-genkey in the test suite, because it takes too long noinst_PROGRAMS = $(TESTS) t-genkey +mkdemodirs: mkdemodirs.in Makefile + sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs + chmod +x mkdemodirs + clean-local: - $(srcdir)/mkdemodirs --clean + -./mkdemodirs --clean + -rm -f mkdemodirs all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf @@ -62,8 +67,8 @@ all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf $(GPG) --homedir . --allow-secret-key-import \ --import Alpha/Secret.gpg Zulu/Secret.gpg -./Alpha/Secret.gpg: secdemo.asc - srcdir=$(srcdir) $(srcdir)/mkdemodirs +./Alpha/Secret.gpg: mkdemodirs secdemo.asc + srcdir=$(srcdir) ./mkdemodirs ./gpg.conf: # This is required for t-sig-notations. diff --git a/tests/gpg/mkdemodirs b/tests/gpg/mkdemodirs.in index ab2c5687..653c91f4 100755 --- a/tests/gpg/mkdemodirs +++ b/tests/gpg/mkdemodirs.in @@ -19,7 +19,7 @@ set -e -GPG="gpg --batch --quiet --no-secmem-warning" +GPG="@GPG@ --batch --quiet --no-secmem-warning" NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' |