|
 |
e40fb7 |
diff -up gnupg-2.0.20/tools/Makefile.am.insttools gnupg-2.0.20/tools/Makefile.am
|
|
|
e40fb7 |
--- gnupg-2.0.20/tools/Makefile.am.insttools 2013-05-10 14:55:49.000000000 +0200
|
|
|
e40fb7 |
+++ gnupg-2.0.20/tools/Makefile.am 2013-05-28 11:30:22.711552140 +0200
|
|
|
e40fb7 |
@@ -36,8 +36,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
|
|
|
e40fb7 |
|
|
|
e40fb7 |
bin_SCRIPTS = gpgsm-gencert.sh
|
|
|
e40fb7 |
if HAVE_USTAR
|
|
|
e40fb7 |
-# bin_SCRIPTS += gpg-zip
|
|
|
e40fb7 |
-noinst_SCRIPTS = gpg-zip
|
|
|
e40fb7 |
+bin_SCRIPTS += gpg-zip
|
|
|
e40fb7 |
+#noinst_SCRIPTS = gpg-zip
|
|
|
e40fb7 |
endif
|
|
|
e40fb7 |
|
|
|
e40fb7 |
if BUILD_SYMCRYPTRUN
|
|
|
e40fb7 |
@@ -53,7 +53,7 @@ else
|
|
|
e40fb7 |
endif
|
|
|
e40fb7 |
|
|
|
e40fb7 |
|
|
|
e40fb7 |
-bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar}
|
|
|
e40fb7 |
+bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} ${gpgtar} gpgsplit
|
|
|
e40fb7 |
if !HAVE_W32_SYSTEM
|
|
|
e40fb7 |
bin_PROGRAMS += watchgnupg gpgparsemail
|
|
|
e40fb7 |
endif
|
|
|
e40fb7 |
@@ -62,7 +62,7 @@ if !DISABLE_REGEX
|
|
|
e40fb7 |
libexec_PROGRAMS = gpg-check-pattern
|
|
|
e40fb7 |
endif
|
|
|
e40fb7 |
|
|
|
e40fb7 |
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
|
|
|
e40fb7 |
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgkey2ssh
|
|
|
e40fb7 |
|
|
|
e40fb7 |
common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
|
|
|
e40fb7 |
pwquery_libs = ../common/libsimple-pwquery.a
|
|
|
e40fb7 |
diff -up gnupg-2.0.20/tools/Makefile.in.insttools gnupg-2.0.20/tools/Makefile.in
|
|
|
e40fb7 |
--- gnupg-2.0.20/tools/Makefile.in.insttools 2013-05-10 15:56:30.000000000 +0200
|
|
|
e40fb7 |
+++ gnupg-2.0.20/tools/Makefile.in 2013-05-28 11:29:48.556819325 +0200
|
|
|
e40fb7 |
@@ -107,12 +107,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
|
|
|
e40fb7 |
@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
|
|
|
e40fb7 |
@HAVE_W32_SYSTEM_TRUE@am__append_7 = gpg-connect-agent-w32info.o
|
|
|
e40fb7 |
bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
|
|
|
e40fb7 |
- gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
|
|
e40fb7 |
- $(am__EXEEXT_3)
|
|
|
e40fb7 |
+ $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
|
|
e40fb7 |
+ $(am__EXEEXT_3) gpgsplit$(EXEEXT)
|
|
|
e40fb7 |
@HAVE_W32_SYSTEM_FALSE@am__append_8 = watchgnupg gpgparsemail
|
|
|
e40fb7 |
@DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
|
|
|
e40fb7 |
noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
|
|
|
e40fb7 |
- make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
|
|
|
e40fb7 |
+ make-dns-cert$(EXEEXT) gpgkey2ssh$(EXEEXT)
|
|
|
e40fb7 |
subdir = tools
|
|
|
e40fb7 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
|
e40fb7 |
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
|
|
|
e40fb7 |
@@ -488,7 +488,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
|
|
|
e40fb7 |
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
|
|
e40fb7 |
bin_SCRIPTS = gpgsm-gencert.sh
|
|
|
e40fb7 |
# bin_SCRIPTS += gpg-zip
|
|
|
e40fb7 |
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
|
|
|
e40fb7 |
+@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip
|
|
|
e40fb7 |
@BUILD_SYMCRYPTRUN_FALSE@symcryptrun =
|
|
|
e40fb7 |
@BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
|
|
|
e40fb7 |
@BUILD_GPGTAR_FALSE@gpgtar =
|