diff options
Diffstat (limited to '')
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/Makefile.am | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 5ed381049..0de5f3336 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2006-10-12 Werner Koch <[email protected]> + + * Makefile.am (gpg-zip, gpgsplit): Do not install due to a + conflict with gpg1. + 2006-10-11 Werner Koch <[email protected]> * gpgsm-gencert.sh: Allow generation of card keys. diff --git a/tools/Makefile.am b/tools/Makefile.am index 41298503c..9aa2c4e85 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,7 +33,8 @@ sbin_SCRIPTS = addgnupghome bin_SCRIPTS = gpgsm-gencert.sh if HAVE_USTAR -bin_SCRIPTS += gpg-zip +# bin_SCRIPTS += gpg-zip +noinst_SCRIPTS = gpg-zip endif if BUILD_SYMCRYPTRUN @@ -43,12 +44,12 @@ else endif bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} \ - gpgparsemail gpgsplit + gpgparsemail if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg endif -noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert +noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a |