|
 |
4538af |
diff -up gnupg-2.1.21/tools/Makefile.am.insttools gnupg-2.1.21/tools/Makefile.am
|
|
|
4538af |
--- gnupg-2.1.21/tools/Makefile.am.insttools 2017-04-03 17:13:56.000000000 +0200
|
|
|
4538af |
+++ gnupg-2.1.21/tools/Makefile.am 2017-07-18 12:10:59.431729640 +0200
|
|
|
4538af |
@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
|
|
|
4538af |
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
|
|
4538af |
|
|
|
4538af |
if HAVE_USTAR
|
|
|
4538af |
-# bin_SCRIPTS += gpg-zip
|
|
|
4538af |
-noinst_SCRIPTS = gpg-zip
|
|
|
4538af |
+bin_PROGRAMS += gpg-zip
|
|
|
4538af |
+#noinst_SCRIPTS = gpg-zip
|
|
|
4538af |
endif
|
|
|
4538af |
|
|
|
4538af |
if BUILD_SYMCRYPTRUN
|
|
|
4538af |
@@ -53,7 +53,7 @@ endif
|
|
|
4538af |
|
|
|
4538af |
libexec_PROGRAMS = gpg-wks-client
|
|
|
4538af |
|
|
|
4538af |
-bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
|
|
|
4538af |
+bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} gpgsplit
|
|
|
4538af |
if !HAVE_W32_SYSTEM
|
|
|
4538af |
bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server}
|
|
|
4538af |
endif
|
|
|
4538af |
@@ -63,7 +63,7 @@ libexec_PROGRAMS += gpg-check-pattern
|
|
|
4538af |
endif
|
|
|
4538af |
|
|
|
4538af |
if !HAVE_W32CE_SYSTEM
|
|
|
4538af |
-noinst_PROGRAMS = clean-sat make-dns-cert gpgsplit
|
|
|
4538af |
+noinst_PROGRAMS = clean-sat make-dns-cert
|
|
|
4538af |
endif
|
|
|
4538af |
|
|
|
4538af |
if !HAVE_W32CE_SYSTEM
|
|
|
4538af |
diff -up gnupg-2.1.21/tools/Makefile.in.insttools gnupg-2.1.21/tools/Makefile.in
|
|
|
4538af |
--- gnupg-2.1.21/tools/Makefile.in.insttools 2017-05-15 16:15:04.000000000 +0200
|
|
|
4538af |
+++ gnupg-2.1.21/tools/Makefile.in 2017-07-18 12:12:17.907734745 +0200
|
|
|
4538af |
@@ -137,13 +137,13 @@ DIST_COMMON = $(top_srcdir)/am/cmacros.a
|
|
|
4538af |
@GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
|
|
|
4538af |
@HAVE_W32_SYSTEM_TRUE@am__append_8 = gpg-connect-agent-w32info.o
|
|
|
4538af |
libexec_PROGRAMS = gpg-wks-client$(EXEEXT) $(am__EXEEXT_5)
|
|
|
4538af |
-bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
|
|
|
4538af |
+bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) gpgsplit$(EXEEXT) \
|
|
|
4538af |
$(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_4)
|
|
|
4538af |
@HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail ${gpg_wks_server}
|
|
|
4538af |
@DISABLE_REGEX_FALSE@am__append_10 = gpg-check-pattern
|
|
|
4538af |
@HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
|
|
|
4538af |
@HAVE_W32CE_SYSTEM_FALSE@ make-dns-cert$(EXEEXT) \
|
|
|
4538af |
-@HAVE_W32CE_SYSTEM_FALSE@ gpgsplit$(EXEEXT) $(am__EXEEXT_6)
|
|
|
4538af |
+@HAVE_W32CE_SYSTEM_FALSE@ $(am__EXEEXT_6)
|
|
|
4538af |
@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__append_11 = gpgtar
|
|
|
4538af |
@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__append_12 = gpgtar
|
|
|
4538af |
subdir = tools
|
|
|
4538af |
@@ -582,8 +582,8 @@ libcommontlsnpth = ../common/libcommontl
|
|
|
4538af |
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
|
|
|
4538af |
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
|
|
4538af |
|
|
|
4538af |
-# bin_SCRIPTS += gpg-zip
|
|
|
4538af |
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
|
|
|
4538af |
+@HAVE_USTAR_TRUE@bin_PROGRAMS += gpg-zip
|
|
|
4538af |
+#@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
|
|
|
4538af |
@BUILD_SYMCRYPTRUN_FALSE@symcryptrun =
|
|
|
4538af |
@BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
|
|
|
4538af |
@BUILD_WKS_TOOLS_FALSE@gpg_wks_server =
|